diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2015-07-16 08:19:04 -0700 |
|---|---|---|
| committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2015-07-30 10:56:15 +0000 |
| commit | 5e3d8ee079aac41e06c4fea1264aaf57988827ee (patch) | |
| tree | 01d7a4b285926b9f55815475ccdb92e4be59345b /src | |
| parent | 722be9181da1fe1fa95d74c62405dac29a52b897 (diff) | |
| download | qtwebengine-5e3d8ee079aac41e06c4fea1264aaf57988827ee.tar.gz | |
Update QtWebEngine version to 1.2
The revision was accidentally stepped twice.
Change-Id: I5af7cba7d12be432d09cf6672dac422c72b09852
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index de9dc4e60..01a62a598 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -945,7 +945,7 @@ qreal QQuickWebEngineView::zoomFactor() const /*! \qmlproperty bool WebEngineView::backgroundColor - \since QtWebEngine 1.3 + \since QtWebEngine 1.2 Sets this property to change the color of the WebEngineView's background, behing the document's body. You can set it to "transparent" or to a translucent diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 22fa6b864..e1c5eb25d 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -73,7 +73,7 @@ private: bool m_toggleOn; }; -#define LATEST_WEBENGINEVIEW_REVISION 3 +#define LATEST_WEBENGINEVIEW_REVISION 2 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_OBJECT @@ -92,7 +92,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_PROPERTY(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel NOTIFY webChannelChanged REVISION 1) Q_PROPERTY(QQmlListProperty<QQuickWebEngineScript> userScripts READ userScripts FINAL) Q_PROPERTY(bool activeFocusOnPress READ activeFocusOnPress WRITE setActiveFocusOnPress NOTIFY activeFocusOnPressChanged REVISION 2) - Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION 3) + Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION 2) #ifdef ENABLE_QML_TESTSUPPORT_API Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport FINAL) @@ -260,7 +260,7 @@ public Q_SLOTS: Q_REVISION(1) void fullScreenCancelled(); Q_REVISION(1) void grantFeaturePermission(const QUrl &securityOrigin, Feature, bool granted); Q_REVISION(2) void setActiveFocusOnPress(bool arg); - Q_REVISION(3) void triggerWebAction(WebAction action); + Q_REVISION(2) void triggerWebAction(WebAction action); Q_SIGNALS: void titleChanged(); @@ -280,7 +280,7 @@ Q_SIGNALS: Q_REVISION(1) void profileChanged(); Q_REVISION(1) void webChannelChanged(); Q_REVISION(2) void activeFocusOnPressChanged(bool); - Q_REVISION(3) void backgroundColorChanged(); + Q_REVISION(2) void backgroundColorChanged(); protected: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); |