diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 11:04:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 11:04:39 +0200 |
| commit | b04131f375a64204be962e7b92c88a3ecaf892c5 (patch) | |
| tree | ad3cac0a277791692eb4374af8b647cec5706cb1 /src/webengine/doc/src/webengineview.qdoc | |
| parent | 001ee1d6da4bf6769d702810f8ebcb05978663cc (diff) | |
| parent | 0e5553a1626cb707499d82c96e136ceb79dfb54d (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/core/delegated_frame_node.h
src/webengine/api/qquickwebenginecontextmenudata.cpp
Change-Id: I163488d0d32cd981351608b2886f12e547e24672
Diffstat (limited to 'src/webengine/doc/src/webengineview.qdoc')
| -rw-r--r-- | src/webengine/doc/src/webengineview.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index 4acf3eb55..82fd66989 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -346,21 +346,21 @@ */ /*! - \qmlproperty QSizeF WebEngineView::contentsSize + \qmlproperty size WebEngineView::contentsSize \since QtWebEngine 1.3 Size of the page contents. */ /*! - \qmlproperty QPointF WebEngineView::scrollPosition + \qmlproperty point WebEngineView::scrollPosition \since QtWebEngine 1.3 Scroll position of the page contents. */ /*! - \qmlproperty uint WebEngineView::webChannelWorld + \qmlproperty int WebEngineView::webChannelWorld \since QtWebEngine 1.3 JavaScript world that the web channel instance used by this view is @@ -804,7 +804,7 @@ (Added in Qt 5.6) \value WebEngineView.ExitFullScreen Exit the fullscreen mode. (Added in Qt 5.6) - \value SavePage + \value WebEngineView.SavePage Save the current web page to disk. (Added in Qt 5.7) \omitvalue WebActionCount |