diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:34:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:44:57 +0200 |
| commit | 05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (patch) | |
| tree | af152f5ace10bdc5996ac0fb7cc7fd897928d60a /src/webengine/api/qquickwebenginesettings.cpp | |
| parent | 73eb8fb2ddaa44cd0e8a5dac68cbc1b66f618e0e (diff) | |
| parent | 9fdc847c639ef7060a13b10d9fe704e40357a0a8 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/webengine/api/qquickwebenginesettings_p.h
src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
Change-Id: I9cac7059557084a575af02782af886f55a8d404f
Diffstat (limited to 'src/webengine/api/qquickwebenginesettings.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 44bd308ca..fa73af8b2 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -388,13 +388,13 @@ bool QQuickWebEngineSettings::allowWindowActivationFromJavaScript() const } /*! - \qmlproperty bool WebEngineSettings::hideScrollbars + \qmlproperty bool WebEngineSettings::showScrollBars \since QtWebEngine 1.6 - Hides scrollbars. Disabled by default. + Shows scroll bars. Enabled by default. */ -bool QQuickWebEngineSettings::hideScrollbars() const +bool QQuickWebEngineSettings::showScrollBars() const { - return d_ptr->testAttribute(WebEngineSettings::HideScrollbars); + return d_ptr->testAttribute(WebEngineSettings::ShowScrollBars); } /*! @@ -623,12 +623,12 @@ void QQuickWebEngineSettings::setAllowWindowActivationFromJavaScript(bool on) Q_EMIT allowWindowActivationFromJavaScriptChanged(); } -void QQuickWebEngineSettings::setHideScrollbars(bool on) +void QQuickWebEngineSettings::setShowScrollBars(bool on) { - bool wasOn = d_ptr->testAttribute(WebEngineSettings::HideScrollbars); - d_ptr->setAttribute(WebEngineSettings::HideScrollbars, on); + bool wasOn = d_ptr->testAttribute(WebEngineSettings::ShowScrollBars); + d_ptr->setAttribute(WebEngineSettings::ShowScrollBars, on); if (wasOn != on) - Q_EMIT hideScrollbarsChanged(); + Q_EMIT showScrollBarsChanged(); } void QQuickWebEngineSettings::setUnknownUrlSchemePolicy(QQuickWebEngineSettings::UnknownUrlSchemePolicy policy) |