diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-07-25 13:55:02 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-07-29 07:31:40 +0000 |
| commit | d02092c53f0abb18c8232d7f2155fdcd1c711a9e (patch) | |
| tree | 55480098ddf7faba5c9ef58db1ddf2a46874ed34 /src/webengine | |
| parent | fa138d4a76e9e820f01a75771c30dbced8c4e6f3 (diff) | |
Doc: Move WebEngineView property docs to webengine.qdoc
The docs do not currently get built, because docs for a QML type
need to reside in one file. Also edited the docs for grammar and
style.
Change-Id: Ic62f293e113d0e4bfe0497ce4a665a2a42971eb3
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 20 | ||||
| -rw-r--r-- | src/webengine/doc/src/webengineview.qdoc | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 95aaa39e6..68dfae145 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -993,14 +993,6 @@ void QQuickWebEngineView::setTestSupport(QQuickWebEngineTestSupport *testSupport #endif -/*! - * \qmlproperty bool WebEngineView::activeFocusOnPress - * \since QtWebEngine 1.2 - * - * This property specifies whether the view should gain active focus when pressed. - * The default value is true. - * - */ bool QQuickWebEngineView::activeFocusOnPress() const { Q_D(const QQuickWebEngineView); @@ -1118,18 +1110,6 @@ qreal QQuickWebEngineView::zoomFactor() const return d->adapter->currentZoomFactor(); } -/*! - \qmlproperty bool WebEngineView::backgroundColor - \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 - color to see through the document, or you can set this color to match your - web content in an hybrid app to prevent the white flashes that may appear - during loading. - - The default value is white. -*/ QColor QQuickWebEngineView::backgroundColor() const { Q_D(const QQuickWebEngineView); diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index c84a4d64f..1620f3031 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -791,6 +791,26 @@ */ /*! + \qmlproperty bool WebEngineView::activeFocusOnPress + \since QtWebEngine 1.2 + + Specifies whether the view should gain active focus when pressed. + The default value is \c true. +*/ + +/*! + \qmlproperty bool WebEngineView::backgroundColor + \since QtWebEngine 1.2 + + Changes the color of the WebEngineView's background, behind the document's + body. Can be set to \c "transparent" or to a translucent color to see + through the document or to match the web content in a hybrid app to prevent + the white flashes that may appear during loading. + + The default value is white. +*/ + +/*! \qmltype WebEngineFullScreenRequest \instantiates QQuickWebEngineFullScreenRequest \inqmlmodule QtWebEngine |