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

2 files changed, 12 insertions, 12 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)
diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
index 234763ecf..8a405fcd3 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
+++ b/src/webengine/api/qquickwebenginesettings_p.h
@@ -87,7 +87,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject {
     Q_PROPERTY(bool allowRunningInsecureContent READ allowRunningInsecureContent WRITE setAllowRunningInsecureContent NOTIFY allowRunningInsecureContentChanged REVISION 3 FINAL)
     Q_PROPERTY(bool allowGeolocationOnInsecureOrigins READ allowGeolocationOnInsecureOrigins WRITE setAllowGeolocationOnInsecureOrigins NOTIFY allowGeolocationOnInsecureOriginsChanged REVISION 4 FINAL)
     Q_PROPERTY(bool allowWindowActivationFromJavaScript READ allowWindowActivationFromJavaScript WRITE setAllowWindowActivationFromJavaScript NOTIFY allowWindowActivationFromJavaScriptChanged REVISION 5 FINAL)
-    Q_PROPERTY(bool hideScrollbars READ hideScrollbars WRITE setHideScrollbars NOTIFY hideScrollbarsChanged REVISION 5 FINAL)
+    Q_PROPERTY(bool showScrollBars READ showScrollBars WRITE setShowScrollBars NOTIFY showScrollBarsChanged REVISION 5 FINAL)
     Q_PROPERTY(UnknownUrlSchemePolicy unknownUrlSchemePolicy READ unknownUrlSchemePolicy WRITE setUnknownUrlSchemePolicy NOTIFY unknownUrlSchemePolicyChanged REVISION 5 FINAL)
 
 public:
@@ -125,7 +125,7 @@ public:
     bool allowRunningInsecureContent() const;
     bool allowGeolocationOnInsecureOrigins() const;
     bool allowWindowActivationFromJavaScript() const;
-    bool hideScrollbars() const;
+    bool showScrollBars() const;
     UnknownUrlSchemePolicy unknownUrlSchemePolicy() const;
 
     void setAutoLoadImages(bool on);
@@ -152,7 +152,7 @@ public:
     void setAllowRunningInsecureContent(bool on);
     void setAllowGeolocationOnInsecureOrigins(bool on);
     void setAllowWindowActivationFromJavaScript(bool on);
-    void setHideScrollbars(bool on);
+    void setShowScrollBars(bool on);
     void setUnknownUrlSchemePolicy(UnknownUrlSchemePolicy policy);
 
 signals:
@@ -180,7 +180,7 @@ signals:
     Q_REVISION(3) void allowRunningInsecureContentChanged();
     Q_REVISION(4) void allowGeolocationOnInsecureOriginsChanged();
     Q_REVISION(5) void allowWindowActivationFromJavaScriptChanged();
-    Q_REVISION(5) void hideScrollbarsChanged();
+    Q_REVISION(5) void showScrollBarsChanged();
     Q_REVISION(5) void unknownUrlSchemePolicyChanged();
 
 private: