diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-05-23 14:04:09 +0200 |
|---|---|---|
| committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2015-05-23 15:42:51 +0000 |
| commit | 75af24a2d121ab56c5b60524bf1d7f2af1613025 (patch) | |
| tree | db4a23dd16f53ef7aa30f77081b54335b63ae033 /src/corelib/kernel/qobjectdefs.h | |
| parent | d0b1c646b4a351f7eea2137c68993ae63b2b6bab (diff) | |
QMetaType: Do not automatically register types that derives from a Q_GADGET
Otherwise the type is registered with the wrong name
Change-Id: I68ec3a05e2528816626e648b46ccc9d70b004866
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 31e8a670e9..4d01264906 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -172,6 +172,7 @@ private: \ #define Q_GADGET \ public: \ static const QMetaObject staticMetaObject; \ + void qt_check_for_QGADGET_macro(); \ typedef void QtGadgetHelper; \ private: \ Q_DECL_HIDDEN_STATIC_METACALL static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); |