summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2014-08-10 14:09:55 +0200
committerOlivier Goffart (Woboq GmbH) <ogoffart@woboq.com>2015-02-04 14:59:22 +0000
commitd446b1a5ef1f58d26b226dc185259cc2ab168db2 (patch)
tree3a3022741a28a2e34e9f7db6c4ae603af8d2823d /src/corelib/kernel
parent3f431e279aab16465496cc0de03a1af874c1ce65 (diff)
Use Q_ENUM and Q_FLAG in the Qt namespace
They need a special macro since they have a different metaobject Change-Id: I2fa50b4b2e45990fb01771378765b42f03139183 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qobject.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 092c57ef7f..78f913acf8 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -448,6 +448,8 @@ protected:
QScopedPointer<QObjectData> d_ptr;
static const QMetaObject staticQtMetaObject;
+ friend inline const QMetaObject *qt_getQtMetaObject() Q_DECL_NOEXCEPT
+ { return &staticQtMetaObject; }
friend struct QMetaObject;
friend struct QMetaObjectPrivate;