From 014e7a91f20eb01bac3ec99cea5c76053ae4b59e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 6 Mar 2019 11:01:49 +0100 Subject: 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 --- src/imports/testlib/main.cpp | 1 + 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(uri,1,0,"TestResult"); qmlRegisterType(uri,1,1,"TestResult"); + qmlRegisterType(uri,1,13,"TestResult"); qmlRegisterType(uri,1,0,"TestEvent"); qmlRegisterType(uri,1,2,"TestEvent"); qmlRegisterType(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. -- cgit v1.2.3