From 6601789fd75dfe1abe294e45b97b5433a7f52465 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
Date: Thu, 4 Dec 2014 18:00:40 +0100
Subject: qttest: make findChild available only for QtTest 1.1

Change-Id: I4ceb1a969bd4296b82f899088b02b5e8cf100bcd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/imports/testlib/SignalSpy.qml       |  2 +-
 src/imports/testlib/TestCase.qml        |  4 ++--
 src/imports/testlib/main.cpp            |  3 ++-
 src/imports/testlib/plugins.qmltypes    | 11 ++++++-----
 src/qmltest/quicktestresult_p.h         |  2 +-
 src/quick/doc/src/qmltypereference.qdoc |  4 ++--
 6 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3