diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-05-11 11:42:08 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-05-11 17:02:43 +0200 |
| commit | a1b6a4c9edab853f06b870d9ef60a50b28ca36a6 (patch) | |
| tree | abcdf44e8cb1bed6339de3fd4d28b86e0a7dba4d /src/webengine/api/qquickwebengineview_p.h | |
| parent | 18cc8aa2893e62f2b2679e67ed4747243e25da35 (diff) | |
| parent | 76a990cfa3409214530e77d132cdefd9e96685f9 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I122ca8d3438333c6b41f751c47b1ce1f9a7066b9
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 4539ad34b..40299c1c5 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -84,7 +84,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY urlChanged) Q_PROPERTY(bool isFullScreen READ isFullScreen NOTIFY isFullScreenChanged REVISION 1) 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(QQuickWebEngineProfile *profile READ profile WRITE setProfile NOTIFY profileChanged FINAL REVISION 1) 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) @@ -228,6 +228,7 @@ Q_SIGNALS: Q_REVISION(1) void featurePermissionRequested(const QUrl &securityOrigin, Feature feature); Q_REVISION(1) void newViewRequested(QQuickWebEngineNewViewRequest *request); Q_REVISION(1) void zoomFactorChanged(qreal arg); + Q_REVISION(1) void profileChanged(); Q_REVISION(1) void webChannelChanged(); |