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/qdeclarativedebug | |
| 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/qdeclarativedebug')
| -rw-r--r-- | tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro | 9 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro index d488b53c..78bb8d35 100644 --- a/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro +++ b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro @@ -1,10 +1,13 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += network declarative +CONFIG += testcase +TARGET = tst_qdeclarativedebug + +QT += testlib +contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private script-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h SOURCES += tst_qdeclarativedebug.cpp \ ../shared/debugutil.cpp -CONFIG += parallel_test declarative_debug +CONFIG += parallel_test quick1_debug diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index 83d47fca..eb8e8d87 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -45,11 +45,11 @@ #include <QDebug> #include <QThread> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecontext.h> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qdeclarativeexpression.h> -#include <QtDeclarative/qdeclarativeproperty.h> +#include <QtQuick1/qdeclarativeengine.h> +#include <QtQuick1/qdeclarativecontext.h> +#include <QtQuick1/qdeclarativecomponent.h> +#include <QtQuick1/qdeclarativeexpression.h> +#include <QtQuick1/qdeclarativeproperty.h> #include <private/qdeclarativebinding_p.h> #include <private/qdeclarativeenginedebug_p.h> @@ -59,7 +59,6 @@ #include <private/qdeclarativemetatype_p.h> #include <private/qdeclarativeproperty_p.h> -#include "../../../shared/util.h" #include "../shared/debugutil_p.h" Q_DECLARE_METATYPE(QDeclarativeDebugWatch::State) |