From 78a4c46842975f23cd0d9518eca8b341abbda0b5 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 19 Jun 2012 01:00:16 +0200 Subject: Doc: tmake -> qmake, it's about time Pushing this before 5.0 since it will most certainly trigger a major recompile, which is probably why this has never been changed. Change-Id: I5fd90537d3b754d0a8a1b522d66183513693e0af Reviewed-by: Oswald Buddenhagen --- src/corelib/kernel/qobjectdefs.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 9693147de8..306728d77c 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -109,7 +109,7 @@ class QString; #endif #if defined(QT_NO_QOBJECT_CHECK) -/* tmake ignore Q_OBJECT */ +/* qmake ignore Q_OBJECT */ #define Q_OBJECT_CHECK #else @@ -125,7 +125,7 @@ class QString; to contains a Q_OBJECT macro. */ -/* tmake ignore Q_OBJECT */ +/* qmake ignore Q_OBJECT */ #define Q_OBJECT_CHECK \ template inline void qt_check_for_QOBJECT_macro(const T &_q_argument) const \ { int i = qYouForgotTheQ_OBJECT_Macro(this, &_q_argument); i = i + 1; } @@ -144,7 +144,7 @@ inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {} # define Q_DECL_HIDDEN_STATIC_METACALL Q_DECL_HIDDEN #endif -/* tmake ignore Q_OBJECT */ +/* qmake ignore Q_OBJECT */ #define Q_OBJECT \ public: \ Q_OBJECT_CHECK \ @@ -156,11 +156,11 @@ public: \ private: \ Q_DECL_HIDDEN_STATIC_METACALL static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); -/* tmake ignore Q_OBJECT */ +/* qmake ignore Q_OBJECT */ #define Q_OBJECT_FAKE Q_OBJECT #ifndef QT_NO_META_MACROS -/* tmake ignore Q_GADGET */ +/* qmake ignore Q_GADGET */ #define Q_GADGET \ public: \ static const QMetaObject staticMetaObject; \ @@ -180,11 +180,11 @@ private: #define Q_OVERRIDE(text) Q_OVERRIDE(text) #define Q_ENUMS(x) Q_ENUMS(x) #define Q_FLAGS(x) Q_FLAGS(x) - /* tmake ignore Q_OBJECT */ + /* qmake ignore Q_OBJECT */ #define Q_OBJECT Q_OBJECT - /* tmake ignore Q_OBJECT */ + /* qmake ignore Q_OBJECT */ #define Q_OBJECT_FAKE Q_OBJECT_FAKE - /* tmake ignore Q_GADGET */ + /* qmake ignore Q_GADGET */ #define Q_GADGET Q_GADGET #define Q_SCRIPTABLE Q_SCRIPTABLE #define Q_INVOKABLE Q_INVOKABLE -- cgit v1.2.3