diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript')
3 files changed, 15 insertions, 13 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index 69d25a42..a65b723e 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative script network +CONFIG += testcase +TARGET = tst_qdeclarativeecmascript + +QT += testlib +contains(QT_CONFIG,quick1): QT += quick1 quick1-private script script-private network widgets core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h index 8c7326f6..5c696c9c 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h +++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h @@ -42,19 +42,19 @@ #define TESTTYPES_H #include <QtCore/qobject.h> -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qdeclarativeexpression.h> +#include <QtQuick1/qdeclarative.h> +#include <QtQuick1/qdeclarativeexpression.h> #include <QtCore/qpoint.h> #include <QtCore/qsize.h> -#include <QtDeclarative/qdeclarativelist.h> +#include <QtQuick1/qdeclarativelist.h> #include <QtCore/qrect.h> #include <QtGui/qmatrix.h> #include <QtGui/qcolor.h> #include <QtGui/qvector3d.h> #include <QtCore/qdatetime.h> #include <QtScript/qscriptvalue.h> -#include <QtDeclarative/qdeclarativescriptstring.h> -#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtQuick1/qdeclarativescriptstring.h> +#include <QtQuick1/qdeclarativecomponent.h> class MyQmlAttachedObject : public QObject { diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index f5b2061d..f8731f9f 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativeexpression.h> -#include <QtDeclarative/qdeclarativecontext.h> +#include <QtQuick1/qdeclarativecomponent.h> +#include <QtQuick1/qdeclarativeengine.h> +#include <QtQuick1/qdeclarativeexpression.h> +#include <QtQuick1/qdeclarativecontext.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdebug.h> -#include <QtDeclarative/private/qdeclarativeguard_p.h> +#include <QtQuick1/private/qdeclarativeguard_p.h> #include <QtCore/qdir.h> #include <QtCore/qnumeric.h> #include <private/qdeclarativeengine_p.h> @@ -53,7 +53,6 @@ #include <private/qscriptdeclarativeclass_p.h> #include "testtypes.h" #include "testhttpserver.h" -#include "../../../shared/util.h" #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir |