diff options
| author | Viktor Engelmann <viktor.engelmann@qt.io> | 2017-09-18 15:57:24 +0200 |
|---|---|---|
| committer | Viktor Engelmann <viktor.engelmann@qt.io> | 2017-09-20 10:25:22 +0000 |
| commit | c9b3baa2e2825df6b06e7366d154341f73d4e326 (patch) | |
| tree | be5766b57016b87b981d1088c05357802331e2a4 /src/webengine/api/qquickwebenginesettings.cpp | |
| parent | d8f18e2b918e2f7c8149d3e6cd1510b27bde7dfd (diff) | |
Replace Setting HideScrollbars by ShowScrollBars
Positive options are more intuitive and make for a better API.
Task-number: QTBUG-63179
Change-Id: I632ee768dba52554e7d37d9da84661a1d01f1f37
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
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 12d313783..3ce53337c 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -372,13 +372,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); } /*! @@ -591,12 +591,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::setParentSettings(QQuickWebEngineSettings *parentSettings) |