summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2016-04-06 16:08:00 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2016-04-11 06:48:03 +0000
commitf8ed4ca51333157170f0fc94e2deff0d91cf4833 (patch)
treeb2e0793052a608c3705286c2d67f1df108b832dd
parent85c61bb108f095075f73f14c7a704ed17ba9109d (diff)
Doc: Add docs for new WebEngineView properties
Task-number: QTBUG-52355 Change-Id: I4f332e9e4504b2685360dafd32f2947483f5665c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
-rw-r--r--src/webengine/doc/src/webengineview.qdoc22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc
index 5a262366..79cb90ab 100644
--- a/src/webengine/doc/src/webengineview.qdoc
+++ b/src/webengine/doc/src/webengineview.qdoc
@@ -355,6 +355,28 @@
*/
/*!
+ \qmlproperty QSizeF WebEngineView::contentsSize
+ \since QtWebEngine 1.3
+
+ Size of the page contents.
+*/
+
+/*!
+ \qmlproperty QPointF WebEngineView::scrollPosition
+ \since QtWebEngine 1.3
+
+ Scroll position of the page contents.
+*/
+
+/*!
+ \qmlproperty uint WebEngineView::webChannelWorld
+ \since QtWebEngine 1.3
+
+ JavaScript world that the web channel instance used by this view is
+ installed in.
+*/
+
+/*!
\qmlmethod void WebEngineView::loadHtml(string html, url baseUrl)
Loads the specified \a html as the content of the web view.