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/qdeclarativedebugjs | |
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/qdeclarativedebugjs')
4 files changed, 12 insertions, 10 deletions
diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/app.pro b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro index d1c0cddf..8eb3dfa1 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/app/app.pro +++ b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro @@ -1,7 +1,7 @@ TEMPLATE = app -QT += declarative -CONFIG += declarative_debug +QT += quick1 quick1-private gui widgets +CONFIG += quick1_debug CONFIG += console CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp index 18a7a5f8..8a33335d 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp +++ b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp @@ -44,7 +44,7 @@ #include <QDeclarativeComponent> #include <QDeclarativeEngine> #include <QStringList> -#include <QtDeclarative/private/qdeclarativedebugservice_p.h> +#include <QtQuick1/private/qdeclarativedebugservice_p.h> int main(int argc, char *argv[]) { diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp index 096f3905..aec1dcf0 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp @@ -40,14 +40,13 @@ ****************************************************************************/ #include <qtest.h> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/private/qdeclarativedebugclient_p.h> -#include <QtDeclarative/private/qdeclarativedebugservice_p.h> -#include <QtDeclarative/private/qjsdebuggeragent_p.h> +#include <QtQuick1/QDeclarativeEngine> +#include <QtQuick1/private/qdeclarativedebugclient_p.h> +#include <QtQuick1/private/qdeclarativedebugservice_p.h> +#include <QtQuick1/private/qjsdebuggeragent_p.h> #include <QtCore/QFileInfo> #include <QtCore/QDir> #include <QtCore/QProcess> -#include "../../../shared/util.h" #include "../shared/debugutil_p.h" class QJSDebugClient : public QDeclarativeDebugClient diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro index c293fea7..98f96f82 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative network script +CONFIG += testcase +TARGET = tst_qdeclarativedebugjs + +QT += testlib +contains(QT_CONFIG,quick1): QT += quick1 quick1-private network script core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h |