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/qdeclarativexmllistmodel | |
| 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/qdeclarativexmllistmodel')
| -rw-r--r-- | tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro | 7 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index 64b82677..a3dfd649 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative script gui network +CONFIG += testcase +TARGET = tst_qdeclarativexmllistmodel + +QT += testlib +contains(QT_CONFIG,quick1): QT += quick1 quick1-private script gui network core-private script-private contains(QT_CONFIG,xmlpatterns) { QT += xmlpatterns DEFINES += QTEST_XMLPATTERNS diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index 6a7ae44a..d59b38e4 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -46,7 +46,7 @@ #include <qtest.h> #include <QtTest/qsignalspy.h> -#include <QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h> +#include <QtQuick1/qdeclarativenetworkaccessmanagerfactory.h> #include <QtNetwork/qnetworkaccessmanager.h> #include <QtNetwork/qnetworkrequest.h> #include <QtCore/qtimer.h> @@ -54,10 +54,9 @@ #include <QtCore/qtemporaryfile.h> #ifdef QTEST_XMLPATTERNS -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtQuick1/qdeclarativeengine.h> +#include <QtQuick1/qdeclarativecomponent.h> #include <private/qdeclarativexmllistmodel_p.h> -#include "../../../shared/util.h" #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir |