Make qmetaobject autotest independent of QtWidgets

Change-Id: I4340036a4e6024d9b8d0c7832ad7bfb28ec4bc99
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

diff --git a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro
index a28b8a8..88c5f91 100644 (file)
--- a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro
+++ b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro
@@ -1,5 +1,5 @@
 CONFIG += testcase
 CONFIG += parallel_test
 TARGET = tst_qmetaobject
-QT = core-private gui widgets testlib
+QT = core-private gui testlib
 SOURCES = tst_qmetaobject.cpp

diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index 78ca386..8725c93 100644 (file)
--- 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 <qlabel.h>
+#include <qwindow.h>
 #include <private/qmetaobject_p.h>
 
 Q_DECLARE_METATYPE(const QMetaObject *)
@@ -720,13 +720,13 @@ void tst_QMetaObject::invokeBlockingQueuedMetaMember()
 void tst_QMetaObject::qtMetaObjectInheritance()
 {
     QVERIFY(QObject::staticMetaObject.superClass() == 0);
-    QCOMPARE(QLabel::staticMetaObject.indexOfEnumerator("Qt::Alignment"), -1);
-    QCOMPARE(QLabel::staticMetaObject.indexOfEnumerator("Alignment"), -1);
-    int indexOfAlignment = QLabel::staticMetaObject.indexOfProperty("alignment");
-    QVERIFY(indexOfAlignment != -1);
-    QMetaProperty alignment = QLabel::staticMetaObject.property(indexOfAlignment);
-    QVERIFY(alignment.isValid());
-    QCOMPARE(alignment.enumerator().name(), "Alignment");
+    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");
 }
 
 struct MyType