qttest: make findChild available only for QtTest 1.1

Change-Id: I4ceb1a969bd4296b82f899088b02b5e8cf100bcd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

79 files changed, 89 insertions, 87 deletions

diff --git a/examples/qmltest/qmltest/tst_basic.qml b/examples/qmltest/qmltest/tst_basic.qml
index ba5ebe935a..1d9efbab61 100644
--- a/examples/qmltest/qmltest/tst_basic.qml
+++ b/examples/qmltest/qmltest/tst_basic.qml
@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtTest 1.0
+import QtQuick 2.4
+import QtTest 1.1
 
 TestCase {
     name: "BasicTests"
diff --git a/examples/qmltest/qmltest/tst_item.qml b/examples/qmltest/qmltest/tst_item.qml
index 69e2b83a00..966d7e1bfe 100644
--- a/examples/qmltest/qmltest/tst_item.qml
+++ b/examples/qmltest/qmltest/tst_item.qml
@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtTest 1.0
+import QtQuick 2.4
+import QtTest 1.1
 
 Rectangle {
     id: foo
diff --git a/src/imports/testlib/SignalSpy.qml b/src/imports/testlib/SignalSpy.qml
index 547f403bab..e483e6f71f 100644
--- a/src/imports/testlib/SignalSpy.qml
+++ b/src/imports/testlib/SignalSpy.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 /*!
     \qmltype SignalSpy
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index 700c9112eb..160e0bdb62 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 import "testlogger.js" as TestLogger
 import Qt.test.qtestroot 1.0
 
@@ -101,7 +101,7 @@ import Qt.test.qtestroot 1.0
 
     \code
     import QtQuick 2.0
-    import QtTest 1.0
+    import QtTest 1.1
 
     TestCase {
         name: "DataTests"
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index 59002ba09b..6e28101530 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -140,7 +140,8 @@ public:
     virtual void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtTest"));
-        qmlRegisterType<QuickTestResult>(uri,1,0,"TestResult");
+        qmlRegisterType<QuickTestResult, 0>(uri,1,0,"TestResult");
+        qmlRegisterType<QuickTestResult, 1>(uri,1,1,"TestResult");
         qmlRegisterType<QuickTestEvent>(uri,1,0,"TestEvent");
         qmlRegisterType<QuickTestUtil>(uri,1,0,"TestUtil");
     }
diff --git a/src/imports/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes
index ce90ee0a57..a892f73eb0 100644
--- a/src/imports/testlib/plugins.qmltypes
+++ b/src/imports/testlib/plugins.qmltypes
@@ -4,13 +4,13 @@ import QtQuick.tooling 1.1
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtTest 1.0'
+// 'qmlplugindump QtTest 1.1'
 
 Module {
     Component {
         name: "QuickTestEvent"
         prototype: "QObject"
-        exports: ["QtTest/TestEvent 1.0"]
+        exports: ["TestEvent 1.0"]
         exportMetaObjectRevisions: [0]
         Method {
             name: "keyPress"
@@ -119,8 +119,8 @@ Module {
     Component {
         name: "QuickTestResult"
         prototype: "QObject"
-        exports: ["QtTest/TestResult 1.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["TestResult 1.0", "TestResult 1.1"]
+        exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "RunMode"
             values: {
@@ -252,6 +252,7 @@ Module {
         }
         Method {
             name: "findChild"
+            revision: 1
             type: "QObject*"
             Parameter { name: "parent"; type: "QObject"; isPointer: true }
             Parameter { name: "objectName"; type: "string" }
@@ -260,7 +261,7 @@ Module {
     Component {
         name: "QuickTestUtil"
         prototype: "QObject"
-        exports: ["QtTest/TestUtil 1.0"]
+        exports: ["TestUtil 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "printAvailableFunctions"; type: "bool"; isReadonly: true }
         Property { name: "dragThreshold"; type: "int"; isReadonly: true }
diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h
index 78d0501b7c..0da29e8bd4 100644
--- a/src/qmltest/quicktestresult_p.h
+++ b/src/qmltest/quicktestresult_p.h
@@ -139,7 +139,7 @@ public Q_SLOTS:
 
     QObject *grabImage(QQuickItem *item);
 
-    QObject *findChild(QObject *parent, const QString &objectName);
+    Q_REVISION(1) QObject *findChild(QObject *parent, const QString &objectName);
 
 public:
     // Helper functions for the C++ main() shell.
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index cc602d4aee..430c0ed11a 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -830,14 +830,14 @@ console.log(c + " " + d); // false true
 */
 
 /*!
-\qmlmodule QtTest 1.0
+\qmlmodule QtTest 1.1
 \title Qt Quick Test QML Types
 \brief This module provides QML types to unit test your QML application
 \ingroup qmlmodules
 
 You can import this module using the following statement:
 \code
-import QtTest 1.0
+import QtTest 1.1
 \endcode
 
 For more information about how to use these types, see
diff --git a/tests/auto/qmltest/animatedimage/tst_animatedimage.qml b/tests/auto/qmltest/animatedimage/tst_animatedimage.qml
index d0574da4f5..a58a19fa58 100644
--- a/tests/auto/qmltest/animatedimage/tst_animatedimage.qml
+++ b/tests/auto/qmltest/animatedimage/tst_animatedimage.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/animations/tst_abstractanimationjobcrash.qml b/tests/auto/qmltest/animations/tst_abstractanimationjobcrash.qml
index 6d4b17f83e..008f0ad445 100644
--- a/tests/auto/qmltest/animations/tst_abstractanimationjobcrash.qml
+++ b/tests/auto/qmltest/animations/tst_abstractanimationjobcrash.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     Rectangle {
diff --git a/tests/auto/qmltest/animators/tst_behavior.qml b/tests/auto/qmltest/animators/tst_behavior.qml
index 87b0efff17..17b9bee0e2 100644
--- a/tests/auto/qmltest/animators/tst_behavior.qml
+++ b/tests/auto/qmltest/animators/tst_behavior.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_mixed.qml b/tests/auto/qmltest/animators/tst_mixed.qml
index 488f1c8156..1e3600f80f 100644
--- a/tests/auto/qmltest/animators/tst_mixed.qml
+++ b/tests/auto/qmltest/animators/tst_mixed.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_mixedparallel.qml b/tests/auto/qmltest/animators/tst_mixedparallel.qml
index 2b6ebfc17a..51372008e1 100644
--- a/tests/auto/qmltest/animators/tst_mixedparallel.qml
+++ b/tests/auto/qmltest/animators/tst_mixedparallel.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_mixedsequential.qml b/tests/auto/qmltest/animators/tst_mixedsequential.qml
index 6165cf5438..d1b0f92f59 100644
--- a/tests/auto/qmltest/animators/tst_mixedsequential.qml
+++ b/tests/auto/qmltest/animators/tst_mixedsequential.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_multiwindow.qml b/tests/auto/qmltest/animators/tst_multiwindow.qml
index de73434aab..f0f42725ba 100644
--- a/tests/auto/qmltest/animators/tst_multiwindow.qml
+++ b/tests/auto/qmltest/animators/tst_multiwindow.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 import QtQuick.Window 2.0
 
 Item {
diff --git a/tests/auto/qmltest/animators/tst_nested.qml b/tests/auto/qmltest/animators/tst_nested.qml
index 0426dd96e7..fba5d8350d 100644
--- a/tests/auto/qmltest/animators/tst_nested.qml
+++ b/tests/auto/qmltest/animators/tst_nested.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_on.qml b/tests/auto/qmltest/animators/tst_on.qml
index d6be945723..e82711bb50 100644
--- a/tests/auto/qmltest/animators/tst_on.qml
+++ b/tests/auto/qmltest/animators/tst_on.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_opacity.qml b/tests/auto/qmltest/animators/tst_opacity.qml
index 37603a9ced..94f639e30c 100644
--- a/tests/auto/qmltest/animators/tst_opacity.qml
+++ b/tests/auto/qmltest/animators/tst_opacity.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_parallel.qml b/tests/auto/qmltest/animators/tst_parallel.qml
index 7702dd7dd8..074c7442f7 100644
--- a/tests/auto/qmltest/animators/tst_parallel.qml
+++ b/tests/auto/qmltest/animators/tst_parallel.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_restart.qml b/tests/auto/qmltest/animators/tst_restart.qml
index 3bacf6cb6a..fd9bd46c46 100644
--- a/tests/auto/qmltest/animators/tst_restart.qml
+++ b/tests/auto/qmltest/animators/tst_restart.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_rotation.qml b/tests/auto/qmltest/animators/tst_rotation.qml
index 9ff4278527..deb6006801 100644
--- a/tests/auto/qmltest/animators/tst_rotation.qml
+++ b/tests/auto/qmltest/animators/tst_rotation.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_scale.qml b/tests/auto/qmltest/animators/tst_scale.qml
index 10f3430c84..62f8fe1264 100644
--- a/tests/auto/qmltest/animators/tst_scale.qml
+++ b/tests/auto/qmltest/animators/tst_scale.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_sequential.qml b/tests/auto/qmltest/animators/tst_sequential.qml
index 9841413f70..232d084481 100644
--- a/tests/auto/qmltest/animators/tst_sequential.qml
+++ b/tests/auto/qmltest/animators/tst_sequential.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_targetdestroyed.qml b/tests/auto/qmltest/animators/tst_targetdestroyed.qml
index 92b14d0594..92ed3bda3e 100644
--- a/tests/auto/qmltest/animators/tst_targetdestroyed.qml
+++ b/tests/auto/qmltest/animators/tst_targetdestroyed.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_transformorigin.qml b/tests/auto/qmltest/animators/tst_transformorigin.qml
index bd3483dad5..d11e2040ba 100644
--- a/tests/auto/qmltest/animators/tst_transformorigin.qml
+++ b/tests/auto/qmltest/animators/tst_transformorigin.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_transition.qml b/tests/auto/qmltest/animators/tst_transition.qml
index 67230d2adf..c5becfe68b 100644
--- a/tests/auto/qmltest/animators/tst_transition.qml
+++ b/tests/auto/qmltest/animators/tst_transition.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_x.qml b/tests/auto/qmltest/animators/tst_x.qml
index 35e410e8e2..32f2eac75d 100644
--- a/tests/auto/qmltest/animators/tst_x.qml
+++ b/tests/auto/qmltest/animators/tst_x.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/animators/tst_y.qml b/tests/auto/qmltest/animators/tst_y.qml
index 79fd50e8bf..792cc91782 100644
--- a/tests/auto/qmltest/animators/tst_y.qml
+++ b/tests/auto/qmltest/animators/tst_y.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/borderimage/tst_borderimage.qml b/tests/auto/qmltest/borderimage/tst_borderimage.qml
index 49b4397ea9..91b0310009 100644
--- a/tests/auto/qmltest/borderimage/tst_borderimage.qml
+++ b/tests/auto/qmltest/borderimage/tst_borderimage.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/buttonclick/tst_buttonclick.qml b/tests/auto/qmltest/buttonclick/tst_buttonclick.qml
index aead8b91f2..18882587a9 100644
--- a/tests/auto/qmltest/buttonclick/tst_buttonclick.qml
+++ b/tests/auto/qmltest/buttonclick/tst_buttonclick.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Button {
     id: button
diff --git a/tests/auto/qmltest/createbenchmark/tst_createbenchmark.qml b/tests/auto/qmltest/createbenchmark/tst_createbenchmark.qml
index f504c8f901..8da6fb1150 100644
--- a/tests/auto/qmltest/createbenchmark/tst_createbenchmark.qml
+++ b/tests/auto/qmltest/createbenchmark/tst_createbenchmark.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 TestCase {
     id: top
diff --git a/tests/auto/qmltest/events/tst_drag.qml b/tests/auto/qmltest/events/tst_drag.qml
index 76682ab6fb..1665a8e0ae 100644
--- a/tests/auto/qmltest/events/tst_drag.qml
+++ b/tests/auto/qmltest/events/tst_drag.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle{
     id: root
diff --git a/tests/auto/qmltest/events/tst_events.qml b/tests/auto/qmltest/events/tst_events.qml
index 1ae5d5fbb2..ea6e4ea4fb 100644
--- a/tests/auto/qmltest/events/tst_events.qml
+++ b/tests/auto/qmltest/events/tst_events.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
     width: 50; height: 50
diff --git a/tests/auto/qmltest/events/tst_wheel.qml b/tests/auto/qmltest/events/tst_wheel.qml
index 707b5d46bb..8504939633 100644
--- a/tests/auto/qmltest/events/tst_wheel.qml
+++ b/tests/auto/qmltest/events/tst_wheel.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
     id:top
diff --git a/tests/auto/qmltest/fontloader/tst_fontloader.qml b/tests/auto/qmltest/fontloader/tst_fontloader.qml
index be24bb603d..ea0d8bc7f4 100644
--- a/tests/auto/qmltest/fontloader/tst_fontloader.qml
+++ b/tests/auto/qmltest/fontloader/tst_fontloader.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/gradient/tst_gradient.qml b/tests/auto/qmltest/gradient/tst_gradient.qml
index c25ac19e84..1e9f7d4373 100644
--- a/tests/auto/qmltest/gradient/tst_gradient.qml
+++ b/tests/auto/qmltest/gradient/tst_gradient.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/image/tst_image.qml b/tests/auto/qmltest/image/tst_image.qml
index 1afa5f8274..a507dfe508 100644
--- a/tests/auto/qmltest/image/tst_image.qml
+++ b/tests/auto/qmltest/image/tst_image.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/item/tst_layerInPositioner.qml b/tests/auto/qmltest/item/tst_layerInPositioner.qml
index 706c895264..69f29be269 100644
--- a/tests/auto/qmltest/item/tst_layerInPositioner.qml
+++ b/tests/auto/qmltest/item/tst_layerInPositioner.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/itemgrabber/tst_itemgrabber.qml b/tests/auto/qmltest/itemgrabber/tst_itemgrabber.qml
index 4e60e2d8d6..1a79cb4935 100644
--- a/tests/auto/qmltest/itemgrabber/tst_itemgrabber.qml
+++ b/tests/auto/qmltest/itemgrabber/tst_itemgrabber.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root;
diff --git a/tests/auto/qmltest/listmodel/tst_listmodel.qml b/tests/auto/qmltest/listmodel/tst_listmodel.qml
index 603993a092..aae9ec42ec 100644
--- a/tests/auto/qmltest/listmodel/tst_listmodel.qml
+++ b/tests/auto/qmltest/listmodel/tst_listmodel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml
index 069b62a726..7b7242d17d 100644
--- a/tests/auto/qmltest/listview/tst_listview.qml
+++ b/tests/auto/qmltest/listview/tst_listview.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/pathview/tst_pathview.qml b/tests/auto/qmltest/pathview/tst_pathview.qml
index 820034c960..a6b440e0b8 100644
--- a/tests/auto/qmltest/pathview/tst_pathview.qml
+++ b/tests/auto/qmltest/pathview/tst_pathview.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.1
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/pixel/tst_pixel.qml b/tests/auto/qmltest/pixel/tst_pixel.qml
index 6e4055b367..9b0b9e57c1 100644
--- a/tests/auto/qmltest/pixel/tst_pixel.qml
+++ b/tests/auto/qmltest/pixel/tst_pixel.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
     id:rect
diff --git a/tests/auto/qmltest/qqmlbinding/tst_binding.qml b/tests/auto/qmltest/qqmlbinding/tst_binding.qml
index 81f9c04b55..35cf7e071d 100644
--- a/tests/auto/qmltest/qqmlbinding/tst_binding.qml
+++ b/tests/auto/qmltest/qqmlbinding/tst_binding.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
     id: screen
diff --git a/tests/auto/qmltest/qqmlbinding/tst_binding2.qml b/tests/auto/qmltest/qqmlbinding/tst_binding2.qml
index b1f2143751..944f88b072 100644
--- a/tests/auto/qmltest/qqmlbinding/tst_binding2.qml
+++ b/tests/auto/qmltest/qqmlbinding/tst_binding2.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
     id: screen
diff --git a/tests/auto/qmltest/rectangle/tst_rectangle.qml b/tests/auto/qmltest/rectangle/tst_rectangle.qml
index caf40cdb26..a0a6ee4862 100644
--- a/tests/auto/qmltest/rectangle/tst_rectangle.qml
+++ b/tests/auto/qmltest/rectangle/tst_rectangle.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/selftests/tst_compare.qml b/tests/auto/qmltest/selftests/tst_compare.qml
index efb4ce0349..2c1ecb5223 100644
--- a/tests/auto/qmltest/selftests/tst_compare.qml
+++ b/tests/auto/qmltest/selftests/tst_compare.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 TestCase {
     name: "SelfTests_compare"
diff --git a/tests/auto/qmltest/selftests/tst_compare_quickobjects.qml b/tests/auto/qmltest/selftests/tst_compare_quickobjects.qml
index f246f0b116..de652ae044 100644
--- a/tests/auto/qmltest/selftests/tst_compare_quickobjects.qml
+++ b/tests/auto/qmltest/selftests/tst_compare_quickobjects.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 TestCase {
     name: "SelfTests_compare_QuickObjects"
diff --git a/tests/auto/qmltest/selftests/tst_datadriven.qml b/tests/auto/qmltest/selftests/tst_datadriven.qml
index cc3afc43b5..a371bc9034 100644
--- a/tests/auto/qmltest/selftests/tst_datadriven.qml
+++ b/tests/auto/qmltest/selftests/tst_datadriven.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
   TestCase {
diff --git a/tests/auto/qmltest/selftests/tst_destroy.qml b/tests/auto/qmltest/selftests/tst_destroy.qml
index 764f21ecbc..d943c5ed7a 100644
--- a/tests/auto/qmltest/selftests/tst_destroy.qml
+++ b/tests/auto/qmltest/selftests/tst_destroy.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import QtTest 1.0
+import QtTest 1.1
 
 TestCase {
     id: testCase
diff --git a/tests/auto/qmltest/selftests/tst_findChild.qml b/tests/auto/qmltest/selftests/tst_findChild.qml
index 69bcb390e9..ae0b24e0de 100644
--- a/tests/auto/qmltest/selftests/tst_findChild.qml
+++ b/tests/auto/qmltest/selftests/tst_findChild.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 TestCase {
     name: "tst_findChild"
diff --git a/tests/auto/qmltest/selftests/tst_selftests.qml b/tests/auto/qmltest/selftests/tst_selftests.qml
index 5d91141429..167c21774a 100644
--- a/tests/auto/qmltest/selftests/tst_selftests.qml
+++ b/tests/auto/qmltest/selftests/tst_selftests.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 TestCase {
     name: "SelfTests"
diff --git a/tests/auto/qmltest/shadersource/tst_DynamicallyCreated.qml b/tests/auto/qmltest/shadersource/tst_DynamicallyCreated.qml
index bbfa08f443..689f04aa04 100644
--- a/tests/auto/qmltest/shadersource/tst_DynamicallyCreated.qml
+++ b/tests/auto/qmltest/shadersource/tst_DynamicallyCreated.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.2
 import QtQuick.Window 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     width: 100
diff --git a/tests/auto/qmltest/shadersource/tst_DynamicallyCreatedSource.qml b/tests/auto/qmltest/shadersource/tst_DynamicallyCreatedSource.qml
index 2042afa2c5..c04aab3c01 100644
--- a/tests/auto/qmltest/shadersource/tst_DynamicallyCreatedSource.qml
+++ b/tests/auto/qmltest/shadersource/tst_DynamicallyCreatedSource.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root
diff --git a/tests/auto/qmltest/shadersource/tst_SourceInOtherWindow.qml b/tests/auto/qmltest/shadersource/tst_SourceInOtherWindow.qml
index b00cfbc5f8..81aac5fb9e 100644
--- a/tests/auto/qmltest/shadersource/tst_SourceInOtherWindow.qml
+++ b/tests/auto/qmltest/shadersource/tst_SourceInOtherWindow.qml
@@ -34,7 +34,7 @@
 import QtQuick 2.0
 import QtQuick.Window 2.0
 
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     width: 100
diff --git a/tests/auto/qmltest/shadersource/tst_SourceItem.qml b/tests/auto/qmltest/shadersource/tst_SourceItem.qml
index 822b53d6fa..bde6ce2a0b 100644
--- a/tests/auto/qmltest/shadersource/tst_SourceItem.qml
+++ b/tests/auto/qmltest/shadersource/tst_SourceItem.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: root
diff --git a/tests/auto/qmltest/shadersource/tst_SourcedFromOtherWindow.qml b/tests/auto/qmltest/shadersource/tst_SourcedFromOtherWindow.qml
index 4fb08a02f6..48f1f3ecc2 100644
--- a/tests/auto/qmltest/shadersource/tst_SourcedFromOtherWindow.qml
+++ b/tests/auto/qmltest/shadersource/tst_SourcedFromOtherWindow.qml
@@ -34,7 +34,7 @@
 import QtQuick 2.0
 import QtQuick.Window 2.0
 
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     Rectangle {
diff --git a/tests/auto/qmltest/stability/tst_unloadrepeater.qml b/tests/auto/qmltest/stability/tst_unloadrepeater.qml
index dfb631493b..62811ddabc 100644
--- a/tests/auto/qmltest/stability/tst_unloadrepeater.qml
+++ b/tests/auto/qmltest/stability/tst_unloadrepeater.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     width : 800
diff --git a/tests/auto/qmltest/statemachine/tst_anonymousstate.qml b/tests/auto/qmltest/statemachine/tst_anonymousstate.qml
index b05d5c67a9..e5fab06409 100644
--- a/tests/auto/qmltest/statemachine/tst_anonymousstate.qml
+++ b/tests/auto/qmltest/statemachine/tst_anonymousstate.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
+import QtTest 1.1
 import QtQml.StateMachine 1.0
 
 TestCase {
diff --git a/tests/auto/qmltest/statemachine/tst_guardcondition.qml b/tests/auto/qmltest/statemachine/tst_guardcondition.qml
index 0390b5f8fa..abe348aa8d 100644
--- a/tests/auto/qmltest/statemachine/tst_guardcondition.qml
+++ b/tests/auto/qmltest/statemachine/tst_guardcondition.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
+import QtTest 1.1
 import QtQml.StateMachine 1.0
 
 TestCase {
diff --git a/tests/auto/qmltest/statemachine/tst_historystate.qml b/tests/auto/qmltest/statemachine/tst_historystate.qml
index 6e2aa70417..1da554c9bb 100644
--- a/tests/auto/qmltest/statemachine/tst_historystate.qml
+++ b/tests/auto/qmltest/statemachine/tst_historystate.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
+import QtTest 1.1
 import QtQml.StateMachine 1.0
 
 TestCase {
diff --git a/tests/auto/qmltest/statemachine/tst_initialstate.qml b/tests/auto/qmltest/statemachine/tst_initialstate.qml
index c08b3f7001..a1fa6f2d55 100644
--- a/tests/auto/qmltest/statemachine/tst_initialstate.qml
+++ b/tests/auto/qmltest/statemachine/tst_initialstate.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
+import QtTest 1.1
 import QtQml.StateMachine 1.0
 
 TestCase {
diff --git a/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml b/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml
index 443771f8f4..792ddd33bc 100644
--- a/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml
+++ b/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
+import QtTest 1.1
 import QtQml.StateMachine 1.0
 
 TestCase {
diff --git a/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml b/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml
index f584b7cd01..f123f3f3af 100644
--- a/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml
+++ b/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
+import QtTest 1.1
 import QtQml.StateMachine 1.0
 
 TestCase {
diff --git a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml
index 2e3a5efdfd..1926b100b6 100644
--- a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml
+++ b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
+import QtTest 1.1
 import QtQml.StateMachine 1.0
 
 TestCase {
diff --git a/tests/auto/qmltest/statemachine/tst_trafficlight.qml b/tests/auto/qmltest/statemachine/tst_trafficlight.qml
index 3f731a4014..6e2eebb354 100644
--- a/tests/auto/qmltest/statemachine/tst_trafficlight.qml
+++ b/tests/auto/qmltest/statemachine/tst_trafficlight.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
+import QtTest 1.1
 import QtQml.StateMachine 1.0
 
 TestCase {
diff --git a/tests/auto/qmltest/text/tst_text.qml b/tests/auto/qmltest/text/tst_text.qml
index b1d743f630..772d9987bc 100644
--- a/tests/auto/qmltest/text/tst_text.qml
+++ b/tests/auto/qmltest/text/tst_text.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/textedit/tst_textedit.qml b/tests/auto/qmltest/textedit/tst_textedit.qml
index 1dc7084049..a7fb2374b6 100644
--- a/tests/auto/qmltest/textedit/tst_textedit.qml
+++ b/tests/auto/qmltest/textedit/tst_textedit.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/qmltest/textinput/tst_textinput.qml b/tests/auto/qmltest/textinput/tst_textinput.qml
index 9a00ac8a60..4942665e9d 100644
--- a/tests/auto/qmltest/textinput/tst_textinput.qml
+++ b/tests/auto/qmltest/textinput/tst_textinput.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     id: top
diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml
index 92e27b9945..8374552974 100755
--- a/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml
+++ b/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
   id:container
diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml
index 48c4fb734c..1a8ca81ba0 100755
--- a/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml
+++ b/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
   id:container
diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_numberanimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_numberanimation.qml
index 7c4496b206..c5f9860fe2 100644
--- a/tests/auto/quick/qquickanimationcontroller/data/tst_numberanimation.qml
+++ b/tests/auto/quick/qquickanimationcontroller/data/tst_numberanimation.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
   id:container
diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml
index 1a17a1a908..87cba880af 100644
--- a/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml
+++ b/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
   id:container
diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_sequentialanimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_sequentialanimation.qml
index 59671f5145..4098af14f2 100644
--- a/tests/auto/quick/qquickanimationcontroller/data/tst_sequentialanimation.qml
+++ b/tests/auto/quick/qquickanimationcontroller/data/tst_sequentialanimation.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Rectangle {
   id:container
diff --git a/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml b/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml
index 000888a36f..5be221042e 100644
--- a/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Component {
         id:canvas
diff --git a/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml b/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml
index c8c2f4960f..b0cae69fe3 100644
--- a/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 import QtQuick.Window 2.1
 
 TestCase {
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_context.qml b/tests/auto/quick/qquickcanvasitem/data/tst_context.qml
index b18250291e..f266c16d76 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_context.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_context.qml
@@ -1,6 +1,6 @@
 
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 Canvas {
     id: canvas
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml b/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml
index 487f7dc903..281264ba92 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtTest 1.0
+import QtTest 1.1
 
 CanvasTestCase {
    id:testCase
diff --git a/tests/auto/quick/qquicklistview/data/outsideViewportChangeNotAffectingView.qml b/tests/auto/quick/qquicklistview/data/outsideViewportChangeNotAffectingView.qml
index c57cde5eda..c5fb53a3de 100644
--- a/tests/auto/quick/qquicklistview/data/outsideViewportChangeNotAffectingView.qml
+++ b/tests/auto/quick/qquicklistview/data/outsideViewportChangeNotAffectingView.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import QtTest 1.0
+import QtTest 1.1
 
 Item {
     width: 300