diff options
Diffstat (limited to 'src/imports/testlib')
-rw-r--r-- | src/imports/testlib/SignalSpy.qml | 2 | ||||
-rw-r--r-- | src/imports/testlib/TestCase.qml | 4 | ||||
-rw-r--r-- | src/imports/testlib/main.cpp | 3 | ||||
-rw-r--r-- | src/imports/testlib/plugins.qmltypes | 11 |
4 files changed, 11 insertions, 9 deletions
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 } |