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/qdeclarativeview | |
| 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/qdeclarativeview')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro | 7 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro index fc4790d2..e5b64c61 100644 --- a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro +++ b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativeview + +QT += testlib +contains(QT_CONFIG,quick1): QT += quick1 gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeview.cpp diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp index 1a2fba24..785050c2 100644 --- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp +++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp @@ -40,12 +40,11 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QSignalSpy> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qdeclarativecontext.h> -#include <QtDeclarative/qdeclarativeview.h> -#include <QtDeclarative/qdeclarativeitem.h> -#include <QtGui/qgraphicswidget.h> -#include "../../../shared/util.h" +#include <QtQuick1/qdeclarativecomponent.h> +#include <QtQuick1/qdeclarativecontext.h> +#include <QtQuick1/qdeclarativeview.h> +#include <QtQuick1/qdeclarativeitem.h> +#include <QtWidgets/qgraphicswidget.h> #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir |