cleaned up declarative autotests to build with refactor branch

Change-Id: I782ebc6d3245fc05e193ecd9b8712aea11a31f9e
Reviewed-on: http://codereview.qt.nokia.com/3412
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro
index 8c3c030..6748d75 100644 (file)
--- a/tests/auto/declarative/examples/examples.pro
+++ b/tests/auto/declarative/examples/examples.pro
@@ -18,4 +18,4 @@ symbian: {
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private qtquick1-private
+QT += core-private gui-private declarative-private qtquick1-private widgets-private

diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 022b987..5368a0e 100644 (file)
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -239,7 +239,8 @@ void tst_examples::sgexamples()
     QCOMPARE(view.status(), QSGView::Ready);
     view.show();
 
-    QTest::qWaitForWindowShown(&view);
+    QTest::qWait(100);
+
 }
 
 QTEST_MAIN(tst_examples)

diff --git a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
index 9f9e066..4a785a9 100644 (file)
--- a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "tst_qjsvalue.h"
-#include <QtGui/QPushButton>
+#include <QtWidgets/QPushButton>
 
 //TESTED_CLASS=
 //TESTED_FILES=

diff --git a/tests/auto/declarative/qsglistview/qsglistview.pro b/tests/auto/declarative/qsglistview/qsglistview.pro
index 9b31bcb..3e18e9b 100644 (file)
--- a/tests/auto/declarative/qsglistview/qsglistview.pro
+++ b/tests/auto/declarative/qsglistview/qsglistview.pro
@@ -14,5 +14,5 @@ symbian: {
 }
 
 CONFIG += parallel_test
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private widgets widgets-private
 QT += opengl-private

diff --git a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
index 5ee13e8..48a10ca 100644 (file)
--- a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
+++ b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtGui/QStringListModel>
+#include <QtWidgets/QStringListModel>
 #include <QtDeclarative/qsgview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecontext.h>

diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index 54ea66a..c9522f9 100644 (file)
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 SOURCES  += tst_headersclean.cpp
 QT = core
 
-contains(QT_CONFIG,declarative): QT += declarative
+contains(QT_CONFIG,declarative): QT += declarative declarative-private

diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/headersclean/tst_headersclean.cpp
index 9aa7f1d..60bb799 100644 (file)
--- a/tests/auto/headersclean/tst_headersclean.cpp
+++ b/tests/auto/headersclean/tst_headersclean.cpp
@@ -49,7 +49,6 @@
 #include <QtCore/QtCore>
 #include <QtTest/QtTest>
 
-#include <QtDeclarative/QtDeclarative>
 
 class tst_HeadersClean: public QObject
 {

diff --git a/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro b/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro
index 603eab0..d2b157e 100644 (file)
--- a/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro
+++ b/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro
@@ -11,4 +11,4 @@ symbian: {
 } else {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
-QT += core-private gui-private declarative-private qtquick1-private
+QT += core-private gui-private declarative-private qtquick1-private widgets

diff --git a/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp
index 325071f..9b844de 100644 (file)
--- a/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp
+++ b/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp
@@ -44,7 +44,7 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtQuick1/qdeclarativeitem.h>
-#include <QtGui/qgraphicswidget.h>
+#include <QtWidgets/qgraphicswidget.h>
 #include "../../../shared/util.h"
 
 #ifdef Q_OS_SYMBIAN

diff --git a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
index 010fa36..ca214b1 100644 (file)
--- a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
+++ b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
@@ -17,4 +17,4 @@ symbian: {
 }
 
 CONFIG += parallel_test
-QT += core-private gui-private declarative-private qtquick1-private
+QT += core-private gui-private declarative-private qtquick1-private widgets-private

diff --git a/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
index f4fc4f0..e6bd2d0 100644 (file)
--- a/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
+++ b/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
@@ -44,7 +44,7 @@
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtQuick1/qdeclarativeitem.h>
 #include <QtDeclarative/qdeclarativecontext.h>
-#include <QtGui/qmenubar.h>
+#include <QtWidgets/qmenubar.h>
 #include <QSignalSpy>
 #include "../../../shared/util.h"
 #include "qmlruntime.h"