diff options
author | Matthew Cattell <matthew.cattell@nokia.com> | 2011-08-23 16:11:31 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-08-24 12:04:21 +0200 |
commit | c9224b6cf5cceb7d5314f7504d44bfe72bc66950 (patch) | |
tree | 2e73e0f014e638deb6eceeeeb7516faaa93e597a /tests | |
parent | 86680a46021d89e1ff77275e0427c4b20a19a270 (diff) |
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>
Diffstat (limited to 'tests')
11 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index 8c3c030692..6748d7518b 100644 --- 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 022b9870c5..5368a0eda4 100644 --- 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 9f9e066003..4a785a92b0 100644 --- 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 9b31bcb7bf..3e18e9b467 100644 --- 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 5ee13e8724..48a10ca669 100644 --- 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 54ea66a51d..c9522f9b50 100644 --- 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 9aa7f1d693..60bb799076 100644 --- 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 603eab08d7..d2b157ec1b 100644 --- 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 325071f489..9b844de946 100644 --- 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 010fa3696a..ca214b1210 100644 --- 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 f4fc4f0d46..e6bd2d0a31 100644 --- 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" |