diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
| commit | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (patch) | |
| tree | 57afb359e42aa922c4ca31666aab1ee7d49c9212 /src/webengine/api/qquickwebengineview.cpp | |
| parent | 765f9c6630afcd9d022e30ffdbe909fbf1ea9549 (diff) | |
| parent | b7fde78d7822ed7f2221acfd9db15b3ff579e29d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginecertificateerror.cpp
src/webengine/doc/src/webengineview.qdoc
tools/qmake/config.tests/libcap/libcap.cpp
Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
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 67a41f659..5087199cc 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1039,14 +1039,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); @@ -1204,18 +1196,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); |