From 1c58f5a1406458669ea8ede15a3e2ea499a005f4 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 21 Oct 2012 15:00:34 -0500 Subject: [PATCH] Fix inadvertent tq changes. --- ChangeLog | 16 ++++++++-------- INSTALL | 4 ++-- NEWS | 2 +- README | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index b204ab3..7df3b96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -241,7 +241,7 @@ * qt/qdbusabstractinterface_p.h: * qt/qdbusinterface.cpp: Make properties in interfaces actually work. The code that was generated would not compile, - due to tqmoc calls to functions that did not exist. They now + due to moc calls to functions that did not exist. They now shall. (r536571) 2006-04-30 Thiago Macieira @@ -322,8 +322,8 @@ 2006-04-28 Robert McQueen - * qt/Makefile.am: Tweak CLEANFILES from qdbusconnection.tqmoc - to qdbusconnection_p.tqmoc. + * qt/Makefile.am: Tweak CLEANFILES from qdbusconnection.moc + to qdbusconnection_p.moc. 2006-04-24 John (J5) Palmieri @@ -406,7 +406,7 @@ 2006-04-10 Thiago Macieira * qt/Makefile.am: fix the dependency for - qdbusconnection_p.tqmoc. It's included in qdbusintegrator.cpp, + qdbusconnection_p.moc. It's included in qdbusintegrator.cpp, not in qdbusconnection.cpp. Thanks to Jakub Stachowski for spotting this. @@ -550,7 +550,7 @@ 2006-02-28 Thiago Macieira - * qt/Makefile.am: Patch by Sjoerd Simons. More .tqmoc issues: + * qt/Makefile.am: Patch by Sjoerd Simons. More .moc issues: make/automake don't detect that we're talking about the same .lo file if I specify the full path to the source files. @@ -570,7 +570,7 @@ 2006-02-25 Thiago Macieira * qt/Makefile.am: Patch by Sjoerd Simons. Fix the path to the - .lo files taking tqmoc sources. + .lo files taking moc sources. 2006-02-25 Havoc Pennington @@ -616,7 +616,7 @@ 2006-02-16 Robert McQueen * configure.in: Patch from Debian packages by Sjoerd Simons - to add --with-qt-tqmoc and --with-qt3-tqmoc + to add --with-qt-moc and --with-qt3-moc arguments so it's possible to build both bindings in the same tree. @@ -7280,7 +7280,7 @@ you don't need pyrex to make dist * qt/Makefile.am (libdbus_qt_1_la_SOURCES): add integrator.h to - sources; run tqmoc + sources; run moc 2004-03-18 Richard Hult diff --git a/INSTALL b/INSTALL index f6850c2..f0b415b 100644 --- a/INSTALL +++ b/INSTALL @@ -75,8 +75,8 @@ and works in Qt 4.1.2, but not the dbusidl2cpp tool. Note that DBus detects QtCore and QtXml during the configure process using pkg-config. You may need to set the PKG_CONFIG_PATH to include the Qt4 library directory. If you don't have your Qt4 installed, then -you may also need to use the --with-qt-tqmoc directive to point to the -Qt4 tqmoc executable (e.g. $QTDIR/bin/tqmoc). +you may also need to use the --with-qt-moc directive to point to the +Qt4 moc executable (e.g. $QTDIR/bin/moc). Qt 3 Bindings diff --git a/NEWS b/NEWS index e04e914..e8c9183 100644 --- a/NEWS +++ b/NEWS @@ -21,7 +21,7 @@ D-BUS 0.62 (12 June 2006) - Added the dbusidl2cpp, dbuscpp2xml and dbus tools - Added example programs (ping-pong, complex ping-pong, listnames, chat) - Updated selftests - - Fixed compilation and .tqmoc- and .ui-file processing and cleaning + - Fixed compilation and .moc- and .ui-file processing and cleaning - Made central classes derive from QObject - Enhance error reporting - Many bugfixes diff --git a/README b/README index 9124927..0eb45e3 100644 --- a/README +++ b/README @@ -42,8 +42,8 @@ the ./configure program. --enable-selinux build with SELinux support --enable-dnotify build with dnotify support (linux only) - --with-qt-tqmoc= tqmoc for Qt - --with-qt3-tqmoc= tqmoc for Qt3 + --with-qt-moc= moc for Qt + --with-qt3-moc= moc for Qt3 --with-xml=libxml/expat XML library to use --with-init-scripts=redhat Style of init scripts to install --with-session-socket-dir=dirname Where to put sockets for the per-login-session message bus