qttest: make findChild available only for QtTest 1.1

Change-Id: I4ceb1a969bd4296b82f899088b02b5e8cf100bcd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-04 18:00:40 +01:00 · 2014-12-04 18:00:40 +01:00 · 6601789fd7
parent e8338b8e86
commit 6601789fd7
79 changed files with 89 additions and 87 deletions
--- 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"
--- 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
--- 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
--- 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"
--- 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");
    }
--- 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 }
--- 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.
--- 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
--- 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
--- 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 {
--- 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;
--- 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;
--- 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;
--- 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;
--- 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 {
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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;
--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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"
--- 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 {
--- 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
--- 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"
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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 {
--- 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
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 {
--- 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
--- 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
--- 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