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/qdeclarativetext | |
| 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/qdeclarativetext')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro | 7 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro index c0831f70..b0155932 100644 --- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativetext + +QT += testlib +contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui gui-private widgets widgets-private core-private script-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index af354166..0d0eb63c 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <qtest.h> #include <QTextDocument> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtQuick1/qdeclarativeengine.h> +#include <QtQuick1/qdeclarativecomponent.h> #include <private/qdeclarativetext_p.h> #include <private/qdeclarativetext_p_p.h> #include <private/qdeclarativevaluetype_p.h> @@ -52,7 +52,6 @@ #include <private/qapplication_p.h> #include <limits.h> -#include "../../../shared/util.h" #include "testhttpserver.h" #ifdef Q_OS_SYMBIAN |