aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro2
-rw-r--r--tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp4
-rw-r--r--tests/auto/declarative/debugger/qdeclarativeinspector/app/qtquick1.qml5
-rw-r--r--tests/auto/declarative/parserstress/tst_parserstress.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp20
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/ElementAssignType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/booleanConversion.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/elementAssign.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/importScope.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/objectsPassThroughSignals.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp4
-rw-r--r--tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp8
-rw-r--r--tests/auto/declarative/qdeclarativeexpression/data/scriptString.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVar.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/remoteLoadCrash.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/dateTimeConversion.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.qml2
31 files changed, 43 insertions, 50 deletions
diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro b/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro
index 90595df881..6433631c4b 100644
--- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro
+++ b/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro
@@ -1,5 +1,5 @@
TARGET = app
-QT += declarative quick widgets qtquick1
+QT += declarative quick widgets
CONFIG += declarative_debug
macx:CONFIG -= app_bundle
diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp b/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp
index 03db274201..a7ef09c283 100644
--- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp
+++ b/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp
@@ -43,7 +43,6 @@
#include <QtCore/QStringList>
#include <QtQuick/QQuickView>
#include <QtGui/QGuiApplication>
-#include <QtQuick1/QDeclarativeView>
int main(int argc, char *argv[])
{
@@ -66,8 +65,7 @@ int main(int argc, char *argv[])
QQuickView *view = new QQuickView();
view->setSource(QUrl::fromLocalFile("app/qtquick2.qml"));
} else {
- QDeclarativeView *view = new QDeclarativeView();
- view->setSource(QUrl::fromLocalFile("app/qtquick1.qml"));
+ qWarning("No suitable QtQuick1 implementation is available!");
}
return app.exec();
}
diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/qtquick1.qml b/tests/auto/declarative/debugger/qdeclarativeinspector/app/qtquick1.qml
deleted file mode 100644
index 1709ef14a4..0000000000
--- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/qtquick1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 1.0
-
-Item {
-
-}
diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp
index 9885392ba2..25ecef15f6 100644
--- a/tests/auto/declarative/parserstress/tst_parserstress.cpp
+++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp
@@ -110,7 +110,7 @@ void tst_parserstress::ecmascript()
QString dataStr = QString::fromUtf8(data);
- QString qml = "import QtQuick 1.0\n";
+ QString qml = "import QtQuick 2.0\n";
qml+= "\n";
qml+= "QtObject {\n";
qml+= " property int test\n";
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index edb025ed49..05db898045 100644
--- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -236,7 +236,7 @@ private:
#define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
{ \
QDeclarativeComponent component(&engine); \
- component.setData("import QtQuick 1.0; QtObject { property variant test: " #name " }", QUrl()); \
+ component.setData("import QtQuick 2.0; QtObject { property variant test: " #name " }", QUrl()); \
\
QObject *obj = component.create(ctxt); \
\
@@ -286,7 +286,7 @@ void tst_qdeclarativecontext::setContextProperty()
// Changes in context properties
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: a }", QUrl());
QObject *obj = component.create(&ctxt2);
@@ -298,7 +298,7 @@ void tst_qdeclarativecontext::setContextProperty()
}
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: b }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: b }", QUrl());
QObject *obj = component.create(&ctxt2);
@@ -312,7 +312,7 @@ void tst_qdeclarativecontext::setContextProperty()
}
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: e.a }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: e.a }", QUrl());
QObject *obj = component.create(&ctxt2);
@@ -326,7 +326,7 @@ void tst_qdeclarativecontext::setContextProperty()
// New context properties
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: a }", QUrl());
QObject *obj = component.create(&ctxt2);
@@ -340,7 +340,7 @@ void tst_qdeclarativecontext::setContextProperty()
// Setting an object-variant context property
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property variant obj: root; }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property variant obj: root; }", QUrl());
QDeclarativeContext ctxt(engine.rootContext());
ctxt.setContextProperty("ctxtProp", QVariant());
@@ -388,7 +388,7 @@ void tst_qdeclarativecontext::setContextObject()
// Changes in context properties
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: a }", QUrl());
QObject *obj = component.create(&ctxt);
@@ -420,7 +420,7 @@ void tst_qdeclarativecontext::destruction()
void tst_qdeclarativecontext::idAsContextProperty()
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant a; a: QtObject { id: myObject } }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant a; a: QtObject { id: myObject } }", QUrl());
QObject *obj = component.create();
QVERIFY(obj);
@@ -440,7 +440,7 @@ void tst_qdeclarativecontext::idAsContextProperty()
void tst_qdeclarativecontext::readOnlyContexts()
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { id: me }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { id: me }", QUrl());
QObject *obj = component.create();
QVERIFY(obj);
@@ -485,7 +485,7 @@ void tst_qdeclarativecontext::nameForObject()
// As an id
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { id: root; property QtObject o: QtObject { id: nested } }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { id: root; property QtObject o: QtObject { id: nested } }", QUrl());
QObject *o = component.create();
QVERIFY(o != 0);
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml
index 723b9c39fd..cef8ae09ea 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
property alias group: obj
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml
index 4127ca4375..4a45535a50 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
property int value
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ElementAssignType.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ElementAssignType.qml
index 4127ca4375..4a45535a50 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/ElementAssignType.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/ElementAssignType.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
property int value
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml
index 612c599184..79d6e6887c 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
AliasToCompositeElementType1 {
group.value: 13
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml
index a27c16dd2e..b855a183ee 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import Qt.test 1.0
Item {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml
index fa2bb5eb6d..b0bb3681cf 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import Qt.test 1.0
Item {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml
index 4fa6861b08..b318af0138 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import Qt.test 1.0
Item {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml
index 56fcc2ec7c..c5f56a8798 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import Qt.test 1.0
Item {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml
index a046bbf504..b07db8ba40 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import Qt.test 1.0
Item {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml
index 22311d6bb3..35c9d6fd5d 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import Qt.test 1.0
MyQmlObject {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/booleanConversion.qml b/tests/auto/declarative/qdeclarativeecmascript/data/booleanConversion.qml
index a7e08ecc56..a363cf4dd1 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/booleanConversion.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/booleanConversion.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.2.qml
index 70c281691b..9a5732c194 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.2.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/elementAssign.qml b/tests/auto/declarative/qdeclarativeecmascript/data/elementAssign.qml
index 61854df71c..0d75cbf6fc 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/elementAssign.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/elementAssign.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/importScope.qml b/tests/auto/declarative/qdeclarativeecmascript/data/importScope.qml
index a72847f0d7..9b907f11f9 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/importScope.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/importScope.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "importScope.1.js" as ImportScope1
import "importScope.2.js" as ImportScope2
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/objectsPassThroughSignals.qml b/tests/auto/declarative/qdeclarativeecmascript/data/objectsPassThroughSignals.qml
index 0c99f12e7d..98f9e05bdf 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/objectsPassThroughSignals.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/objectsPassThroughSignals.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
id: root
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml
index a8f679baec..0f972d5459 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_21864.qml
@@ -1,5 +1,5 @@
import "qtbug_21864.js" as Test
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
property bool test: Test.test
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 9c844057a6..214a99bb8d 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -2695,7 +2695,7 @@ void tst_qdeclarativeecmascript::cppOwnershipReturnValue()
QVERIFY(source.value == 0);
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0\nQtObject {\nComponent.onCompleted: { var a = source.create(); }\n}\n", QUrl());
+ component.setData("import QtQuick 2.0\nQtObject {\nComponent.onCompleted: { var a = source.create(); }\n}\n", QUrl());
QObject *object = component.create();
@@ -2723,7 +2723,7 @@ void tst_qdeclarativeecmascript::ownershipCustomReturnValue()
QVERIFY(source.value == 0);
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0\nQtObject {\nComponent.onCompleted: { var a = source.createQmlObject(); }\n}\n", QUrl());
+ component.setData("import QtQuick 2.0\nQtObject {\nComponent.onCompleted: { var a = source.createQmlObject(); }\n}\n", QUrl());
QObject *object = component.create();
diff --git a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
index f8b0ef625d..1de738f81f 100644
--- a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
+++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
@@ -197,7 +197,7 @@ void tst_qdeclarativeengine::clearComponentCache()
{
QFile file("temp.qml");
QVERIFY(file.open(QIODevice::WriteOnly));
- file.write("import QtQuick 1.0\nQtObject {\nproperty int test: 10\n}\n");
+ file.write("import QtQuick 2.0\nQtObject {\nproperty int test: 10\n}\n");
file.close();
}
@@ -214,7 +214,7 @@ void tst_qdeclarativeengine::clearComponentCache()
{
QFile file("temp.qml");
QVERIFY(file.open(QIODevice::WriteOnly));
- file.write("import QtQuick 1.0\nQtObject {\nproperty int test: 11\n}\n");
+ file.write("import QtQuick 2.0\nQtObject {\nproperty int test: 11\n}\n");
file.close();
}
@@ -253,7 +253,7 @@ void tst_qdeclarativeengine::outputWarningsToStandardError()
QCOMPARE(engine.outputWarningsToStandardError(), true);
QDeclarativeComponent c(&engine);
- c.setData("import QtQuick 1.0; QtObject { property int a: undefined }", QUrl());
+ c.setData("import QtQuick 2.0; QtObject { property int a: undefined }", QUrl());
QVERIFY(c.isReady() == true);
@@ -310,7 +310,7 @@ void tst_qdeclarativeengine::objectOwnership()
{
QDeclarativeEngine engine;
QDeclarativeComponent c(&engine);
- c.setData("import QtQuick 1.0; QtObject { property QtObject object: QtObject {} }", QUrl());
+ c.setData("import QtQuick 2.0; QtObject { property QtObject object: QtObject {} }", QUrl());
QObject *o = c.create();
QVERIFY(o != 0);
diff --git a/tests/auto/declarative/qdeclarativeexpression/data/scriptString.qml b/tests/auto/declarative/qdeclarativeexpression/data/scriptString.qml
index edd4048cc1..38c3d1b456 100644
--- a/tests/auto/declarative/qdeclarativeexpression/data/scriptString.qml
+++ b/tests/auto/declarative/qdeclarativeexpression/data/scriptString.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import Test 1.0
TestObject {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml
index 785a27dd79..887d7fae50 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
Component {
Item {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVar.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVar.qml
index 65826dcc87..89e66c6172 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVar.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVar.qml
@@ -1,7 +1,7 @@
// This tests assigning literals to "var" properties.
// These properties store JavaScript object references.
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
property var test1: 1
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml b/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml
index 361bcbcb56..5e6c2a91c9 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
NestedComponentRoot {
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/remoteLoadCrash.qml b/tests/auto/declarative/qdeclarativelanguage/data/remoteLoadCrash.qml
index d96a31f8f7..5f237d39a2 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/remoteLoadCrash.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/remoteLoadCrash.qml
@@ -1,3 +1,3 @@
-import QtQuick 1.0
+import QtQuick 2.0
Text {
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 0d521fb67b..480a898ff0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -2276,7 +2276,7 @@ void tst_qdeclarativelanguage::remoteLoadCrash()
server.serveDirectory(testdata());
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; Text {}", QUrl("http://127.0.0.1:14448/remoteLoadCrash.qml"));
+ component.setData("import QtQuick 2.0; Text {}", QUrl("http://127.0.0.1:14448/remoteLoadCrash.qml"));
while (component.isLoading())
QCoreApplication::processEvents( QEventLoop::ExcludeUserInputEvents | QEventLoop::WaitForMoreEvents, 50);
diff --git a/tests/auto/declarative/qdeclarativeqt/data/dateTimeConversion.qml b/tests/auto/declarative/qdeclarativeqt/data/dateTimeConversion.qml
index 4260c8ab22..641ba6e1ca 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/dateTimeConversion.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/dateTimeConversion.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
QtObject {
// months are 0-based - so January = 0, December = 11.
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.qml
index d05918a074..3e8465d6fe 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.qml
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
Item {
WorkerScript {