diff options
author | Kai Koehne <kai.koehne@qt.io> | 2019-03-06 11:01:49 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2019-03-07 08:08:46 +0000 |
commit | 014e7a91f20eb01bac3ec99cea5c76053ae4b59e (patch) | |
tree | c569cd24fb2661c94f3137a716e9ed4f92f21793 | |
parent | 0d25cd5d9763e65dea6239ec7280da16d772c794 (diff) |
Properly revision new TestResult slots
Make sure the slots added in 028617688b0f86ac are only available
with
import QtTest 1.13
Change-Id: I93aa6ff6595ddc4c4583f1785bd19d489793a5f8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | src/imports/testlib/main.cpp | 1 | ||||
-rw-r--r-- | src/qmltest/quicktestresult_p.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index af15a44012..c625c87db7 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -149,6 +149,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtTest")); qmlRegisterType<QuickTestResult, 0>(uri,1,0,"TestResult"); qmlRegisterType<QuickTestResult, 1>(uri,1,1,"TestResult"); + qmlRegisterType<QuickTestResult, 13>(uri,1,13,"TestResult"); qmlRegisterType<QuickTestEvent>(uri,1,0,"TestEvent"); qmlRegisterType<QuickTestEvent>(uri,1,2,"TestEvent"); qmlRegisterType<QuickTestUtil>(uri,1,0,"TestUtil"); diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h index 0659919a39..3643826e5d 100644 --- a/src/qmltest/quicktestresult_p.h +++ b/src/qmltest/quicktestresult_p.h @@ -160,8 +160,8 @@ public Q_SLOTS: Q_REVISION(1) QObject *findChild(QObject *parent, const QString &objectName); - bool isPolishScheduled(QQuickItem *item) const; - bool waitForItemPolished(QQuickItem *item, int timeout); + Q_REVISION(13) bool isPolishScheduled(QQuickItem *item) const; + Q_REVISION(13) bool waitForItemPolished(QQuickItem *item, int timeout); public: // Helper functions for the C++ main() shell. |