diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:33 +0200 |
commit | ac41ad48cacac91e428181f7ededb0896ee64c40 (patch) | |
tree | 44b4afb881fd0b7aa29b0a9da22dddf8e91a4be2 /src/webengine/api/qquickwebengineview.cpp | |
parent | 6534b09073791398bad99863821740e986915bff (diff) | |
parent | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 02484548b..a331716ee 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1052,14 +1052,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); @@ -1222,18 +1214,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); |