From 0fedd03f9ffab1556c7404a98df64c9cf34f8c57 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 25 Aug 2015 11:19:33 +0200 Subject: Mark properties/slots new in Qt 5.5 to be only available in 1.1 Change-Id: Ib36ee2849616461b4214c912cde6b5c7a758b68b Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebengineview_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 3385db425..f85bf64ad 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -99,7 +99,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_PROPERTY(QQuickWebEngineSettings *settings READ settings REVISION 1) Q_PROPERTY(QQuickWebEngineHistory *navigationHistory READ navigationHistory CONSTANT FINAL REVISION 1) Q_PROPERTY(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel NOTIFY webChannelChanged REVISION 1) - Q_PROPERTY(QQmlListProperty userScripts READ userScripts FINAL) + Q_PROPERTY(QQmlListProperty userScripts READ userScripts FINAL REVISION 1) #ifdef ENABLE_QML_TESTSUPPORT_API Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport FINAL) @@ -216,9 +216,9 @@ public Q_SLOTS: void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()); void goBack(); void goForward(); - void goBackOrForward(int index); + Q_REVISION(1) void goBackOrForward(int index); void reload(); - void reloadAndBypassCache(); + Q_REVISION(1) void reloadAndBypassCache(); void stop(); Q_REVISION(1) void findText(const QString &subString, FindFlags options = 0, const QJSValue &callback = QJSValue()); Q_REVISION(1) void fullScreenCancelled(); -- cgit v1.2.3