diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:20:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:20:58 +0200 |
| commit | cba8f2605f34649e3ca2a767edc7ac9509e7fee9 (patch) | |
| tree | c3fbf81bc0eee5db87c357366b22ffd62b9c3dcc /src/webengine/api/qquickwebengineview.cpp | |
| parent | 0c366eb741d8d925418c517d3954900c090aca3d (diff) | |
| parent | 434ef539381bbc3c19f54f914d5bda83eafdc92b (diff) | |
| download | qtwebengine-cba8f2605f34649e3ca2a767edc7ac9509e7fee9.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/webenginewidgets/api/qwebenginepage.cpp
Change-Id: Idb33c92bd53fab76eee8fedb542dbf5e4a10f9e6
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index f5210a816..51dcb61eb 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -710,6 +710,15 @@ void QQuickWebEngineView::setProfile(QQuickWebEngineProfile *profile) Q_D(QQuickWebEngineView); d->setProfile(profile); } +/*! + * \qmlproperty WebEngineSettings QQuickWebEngineView::settings + * \readonly settings + * \since QtWebEngine 1.1 + * + * The \a settings property holds the settings used by this view. + * + * \sa WebEngineSettings + */ QQuickWebEngineSettings *QQuickWebEngineView::settings() const { |