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/qdeclarativepixmapcache | |
| 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/qdeclarativepixmapcache')
| -rw-r--r-- | tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro | 8 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 88871e95..153833c5 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -1,6 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative -QT += network +CONFIG += testcase +TARGET = tst_qdeclarativeviewer + +QT += testlib +contains(QT_CONFIG,quick1): QT += quick1 quick1-private network macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepixmapcache.cpp diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 6609485f..68f1ef86 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -41,11 +41,10 @@ #include <qtest.h> #include <QtTest/QtTest> #include <private/qdeclarativepixmapcache_p.h> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativeimageprovider.h> +#include <QtQuick1/qdeclarativeengine.h> +#include <QtQuick1/qdeclarativeimageprovider.h> #include <QNetworkReply> #include "testhttpserver.h" -#include "../../../shared/util.h" #ifndef QT_NO_CONCURRENT #include <qtconcurrentrun.h> |