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/qdeclarativedebugclient | |
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/qdeclarativedebugclient')
-rw-r--r-- | tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro | 9 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro index 8fa87d29..db98ab09 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro +++ b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro @@ -1,9 +1,12 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += network declarative +CONFIG += testcase +TARGET = tst_qdeclarativedebugclient + +QT += testlib +contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h SOURCES += tst_qdeclarativedebugclient.cpp \ ../shared/debugutil.cpp -CONFIG += declarative_debug +CONFIG += quick1_debug diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp index 43b6b654..0570e2fd 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp +++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp @@ -45,11 +45,10 @@ #include <QDebug> #include <QThread> -#include <QtDeclarative/qdeclarativeengine.h> +#include <QtQuick1/qdeclarativeengine.h> #include <private/qdeclarativedebugclient_p.h> -#include "../../../shared/util.h" #include "../shared/debugutil_p.h" class tst_QDeclarativeDebugClient : public QObject |