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/auto/declarative | |
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/auto/declarative')
5 files changed, 6 insertions, 5 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> |