diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-08 14:48:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 21:03:39 +0200 |
| commit | 580096d61190f6ec0405ed1babe3e7593b705239 (patch) | |
| tree | 54c70324d2f310f60fb380a2331b902029def968 /tests | |
| parent | 90c65880b0ddf07768931df66a0c421af4c287cd (diff) | |
rewrite qtMetaObjectInheritance() without gui
Change-Id: Ie024a3ee755cfe4996ed442686cd73ce13a2d5ff
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro index 0800b71c22..509ade6e2a 100644 --- a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro +++ b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro @@ -1,6 +1,6 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qmetaobject -QT = core-private gui testlib +QT = core-private testlib SOURCES = tst_qmetaobject.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp index 4f1320e375..870e65f0cc 100644 --- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp @@ -43,7 +43,7 @@ #include <qobject.h> #include <qmetaobject.h> -#include <qwindow.h> +#include <qabstractproxymodel.h> #include <private/qmetaobject_p.h> Q_DECLARE_METATYPE(const QMetaObject *) @@ -746,13 +746,13 @@ void tst_QMetaObject::invokeBlockingQueuedMetaMember() void tst_QMetaObject::qtMetaObjectInheritance() { QVERIFY(QObject::staticMetaObject.superClass() == 0); - QCOMPARE(QWindow::staticMetaObject.indexOfEnumerator("Qt::ScreenOrientation"), -1); - QCOMPARE(QWindow::staticMetaObject.indexOfEnumerator("ScreenOrientation"), -1); - int indexOfContentOrientation = QWindow::staticMetaObject.indexOfProperty("contentOrientation"); - QVERIFY(indexOfContentOrientation != -1); - QMetaProperty contentOrientation = QWindow::staticMetaObject.property(indexOfContentOrientation); - QVERIFY(contentOrientation.isValid()); - QCOMPARE(contentOrientation.enumerator().name(), "ScreenOrientation"); + QCOMPARE(QSortFilterProxyModel::staticMetaObject.indexOfEnumerator("Qt::CaseSensitivity"), -1); + QCOMPARE(QSortFilterProxyModel::staticMetaObject.indexOfEnumerator("CaseSensitivity"), -1); + int indexOfSortCaseSensitivity = QSortFilterProxyModel::staticMetaObject.indexOfProperty("sortCaseSensitivity"); + QVERIFY(indexOfSortCaseSensitivity != -1); + QMetaProperty sortCaseSensitivity = QSortFilterProxyModel::staticMetaObject.property(indexOfSortCaseSensitivity); + QVERIFY(sortCaseSensitivity.isValid()); + QCOMPARE(sortCaseSensitivity.enumerator().name(), "CaseSensitivity"); } struct MyType |