diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-06-08 13:58:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-15 19:33:41 +0200 |
| commit | e83c3a0d33b7d8ffd0735136fb5e8b8c73f5bcfd (patch) | |
| tree | 978cbe9f67b39c5ac327dbabfe777f2f42fa91b4 /tests/auto | |
| parent | aca3513dda6316817b04a132a1ab2a033c769f18 (diff) | |
Add automatic metatype declaration for QPointer and QWeakPointer.
Change-Id: Ic9a04fa68d0bb14ef07455a6559e59f4b887f38b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index e1b58e6c4b..861cedf416 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -1462,19 +1462,29 @@ void tst_QMetaType::automaticTemplateRegistration() #endif // Q_COMPILER_VARIADIC_MACROS -#define TEST_QSHAREDPOINTER(FULLTYPE) \ +#define TEST_SMARTPOINTER(SMARTPOINTER, ELEMENT_TYPE) \ { \ - FULLTYPE sp = FULLTYPE::create(); \ + SMARTPOINTER < ELEMENT_TYPE > sp(new ELEMENT_TYPE); \ QVariant v = QVariant::fromValue(sp); \ - QCOMPARE(v.typeName(), #FULLTYPE); \ + QCOMPARE(v.typeName(), #SMARTPOINTER "<" #ELEMENT_TYPE ">"); \ } - TEST_QSHAREDPOINTER(QSharedPointer<QObject>) - TEST_QSHAREDPOINTER(QSharedPointer<QFile>) - TEST_QSHAREDPOINTER(QSharedPointer<QTemporaryFile>) - TEST_QSHAREDPOINTER(QSharedPointer<MyObject>) + TEST_SMARTPOINTER(QSharedPointer, QObject) + TEST_SMARTPOINTER(QSharedPointer, QFile) + TEST_SMARTPOINTER(QSharedPointer, QTemporaryFile) + TEST_SMARTPOINTER(QSharedPointer, MyObject) -#undef TEST_QSHAREDPOINTER + TEST_SMARTPOINTER(QWeakPointer, QObject) + TEST_SMARTPOINTER(QWeakPointer, QFile) + TEST_SMARTPOINTER(QWeakPointer, QTemporaryFile) + TEST_SMARTPOINTER(QWeakPointer, MyObject) + + TEST_SMARTPOINTER(QPointer, QObject) + TEST_SMARTPOINTER(QPointer, QFile) + TEST_SMARTPOINTER(QPointer, QTemporaryFile) + TEST_SMARTPOINTER(QPointer, MyObject) + +#undef TEST_SMARTPOINTER } |