diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 11:22:08 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2012-01-31 06:33:34 +0100 |
| commit | dbf35e498db723ae9850686e462ec4f45bc7b67c (patch) | |
| tree | cf1f98717e131f26e5a6d63f6693935b2fbdb76f /tests/auto/declarative/qdeclarativeviewer | |
| parent | 12a5ddf456ba8549645a8cb28a8b4ed6197a14da (diff) | |
Modify QtQuick1 to build in Qt5
Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeviewer')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro | 7 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp | 14 |
2 files changed, 12 insertions, 9 deletions
diff --git a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro index 8d4b4105..a059fa39 100644 --- a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativeviewer + +QT += testlib +contains(QT_CONFIG,quick1): QT += quick1 gui macx:CONFIG -= app_bundle include(../../../../tools/qml/qml.pri) diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp index 6a38ac8d..fb2cddce 100644 --- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp +++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -40,16 +40,14 @@ ****************************************************************************/ #include <qtest.h> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativeview.h> -#include <QtDeclarative/qdeclarativeitem.h> -#include <QtDeclarative/qdeclarativecontext.h> -#include <QtGui/qmenubar.h> +#include <QtQuick1/qdeclarativeengine.h> +#include <QtQuick1/qdeclarativeview.h> +#include <QtQuick1/qdeclarativeitem.h> +#include <QtQuick1/qdeclarativecontext.h> +#include <QtWidgets/qmenubar.h> #include <QSignalSpy> -#include "../../../shared/util.h" #include "qmlruntime.h" #include "deviceorientation.h" -#include "../../../shared/util.h" #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir @@ -114,8 +112,10 @@ void tst_QDeclarativeViewer::runtimeContextProperty() viewer->show(); QApplication::setActiveWindow(viewer); + //viewer->requestActivateWindow(); QTest::qWaitForWindowShown(viewer); QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(viewer)); + //QTRY_VERIFY(viewer == qGuiApp->focusWindow()); QVERIFY(runtimeObject->property("isActiveWindow").toBool()); |