summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineview_p.h
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2015-02-05 06:58:11 -0800
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-02-06 17:12:21 +0000
commit5e0104030ba3210789c5f7203cc7996dcef71cac (patch)
tree9b39c9592cb3b1a6a917afe728b1c9e0dc9515ec /src/webengine/api/qquickwebengineview_p.h
parenteda8fbdf0d6249f4f89e3456092cbe790b27b1fb (diff)
Proper versioning of the Quick API
- Add missing "REVISION 1" to the new parts of the API: zoomFactor, certificateError and profile. - setZoomFactor should not be a slot. Change-Id: I02551ee7eb7323ff8dbb0b62ea503ed08b2051c2 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p.h')
-rw-r--r--src/webengine/api/qquickwebengineview_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index b8f2fb896..56a1b47ab 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -60,8 +60,8 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
Q_PROPERTY(QString title READ title NOTIFY titleChanged)
Q_PROPERTY(bool canGoBack READ canGoBack NOTIFY urlChanged)
Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY urlChanged)
- Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
- Q_PROPERTY(QQuickWebEngineProfile *profile READ profile WRITE setProfile FINAL)
+ Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged REVISION 1)
+ Q_PROPERTY(QQuickWebEngineProfile *profile READ profile WRITE setProfile FINAL REVISION 1)
Q_PROPERTY(QQuickWebEngineSettings *settings READ settings REVISION 1)
Q_ENUMS(NavigationRequestAction);
Q_ENUMS(NavigationType);
@@ -83,6 +83,7 @@ public:
bool canGoBack() const;
bool canGoForward() const;
qreal zoomFactor() const;
+ void setZoomFactor(qreal arg);
QQuickWebEngineViewExperimental *experimental() const;
@@ -150,7 +151,6 @@ public Q_SLOTS:
void goForward();
void reload();
void stop();
- void setZoomFactor(qreal arg);
Q_SIGNALS:
void titleChanged();
@@ -161,9 +161,9 @@ Q_SIGNALS:
void linkHovered(const QUrl &hoveredUrl);
void navigationRequested(QQuickWebEngineNavigationRequest *request);
void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID);
- void zoomFactorChanged(qreal arg);
- void certificateError(QQuickWebEngineCertificateError *error);
+ Q_REVISION(1) void certificateError(QQuickWebEngineCertificateError *error);
Q_REVISION(1) void newViewRequested(QQuickWebEngineNewViewRequest *request);
+ Q_REVISION(1) void zoomFactorChanged(qreal arg);
protected:
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);