diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2011-12-30 12:00:09 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-24 15:27:25 +0100 |
| commit | 4b8ceb41aed352f10d36db5284453f425dbc5f3f (patch) | |
| tree | 6362bc3353107a7d35b7bb1cefb7f1751fe473fe /tests/auto/other | |
| parent | 6efefb3fe5c7c392bc4857d979dee51042a4f043 (diff) | |
Store the is-a QObject fact with the metatype declaration.
This is a source incompatible change for Q_DECLARE_METATYPE(T*),
which now requires T to be fully defined.
The consequences of this are:
* Forward declared types can no longer be declared as a metatype.
(though this is a very uncommon thing to do).
There is a trivial workaround where necessary.
Change-Id: Id74c40088b8c0b466fcd7c55abd616f69acc82c8
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp index 49516b7c9b..65ac276704 100644 --- a/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp +++ b/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp @@ -99,6 +99,11 @@ struct AbstractTester Q_DECLARE_METATYPE(AbstractTester *) typedef void (*TestFunction)(QObject*); +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject<TestFunction> { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(TestFunction) template <typename T> |