diff options
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 320e41b2e2..dfcc81be03 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -136,18 +136,11 @@ template <typename T1, typename T2> inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {} #endif // QT_NO_QOBJECT_CHECK -#ifdef Q_NO_DATA_RELOCATION -#define Q_OBJECT_GETSTATICMETAOBJECT static const QMetaObject &getStaticMetaObject(); -#else -#define Q_OBJECT_GETSTATICMETAOBJECT -#endif - /* tmake ignore Q_OBJECT */ #define Q_OBJECT \ public: \ Q_OBJECT_CHECK \ static const QMetaObject staticMetaObject; \ - Q_OBJECT_GETSTATICMETAOBJECT \ virtual const QMetaObject *metaObject() const; \ virtual void *qt_metacast(const char *); \ QT_TR_FUNCTIONS \ @@ -162,8 +155,8 @@ private: \ #define Q_GADGET \ public: \ static const QMetaObject staticMetaObject; \ - Q_OBJECT_GETSTATICMETAOBJECT \ private: + #else // Q_MOC_RUN #define slots slots #define signals signals @@ -469,11 +462,7 @@ typedef const QMetaObject& (*QMetaObjectAccessor)(); struct QMetaObjectExtraData { -#ifdef Q_NO_DATA_RELOCATION - const QMetaObjectAccessor *objects; -#else const QMetaObject **objects; -#endif typedef void (*StaticMetacallFunction)(QObject *, QMetaObject::Call, int, void **); //from revision 6 //typedef int (*StaticMetaCall)(QMetaObject::Call, int, void **); //used from revison 2 until revison 5 |