Slider: add property to disable scroll wheel

Add a property to disable the scroll wheel for the Slider.
This is useful if there is a scrollable list of sliders, because scrolling
would be interrupted as soon as the mouse gets above a slider
(whereby scrolling would change the slider value).
By setting this property to false, a user can easily scroll through the list.

[ChangeLog][Slider] add property to disable scroll wheel

Task-number: QTBUG-59271
Change-Id: I9306638ef98f8a0a5035709a67cc1ee40713441a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

3 files changed, 21 insertions, 2 deletions

diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index 4023929a..d55e81a3 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -171,6 +171,16 @@ Control {
     */
     property bool tickmarksEnabled: false
 
+    /*!
+        \qmlproperty bool Slider::wheelEnabled
+
+        This property determines whether the control handles wheel events.
+        The default value is \c true.
+
+        \since QtQuick.Controls 1.6
+    */
+    property alias wheelEnabled: wheelarea.enabled
+
     /*! \internal */
     property bool __horizontal: orientation === Qt.Horizontal
 
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 528f05a8..0d60ec56 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -122,7 +122,9 @@ static const struct {
     { "TreeView", 1, 4 },
 
     { "TextArea", 1, 5 },
-    { "TreeView", 1, 5 }
+    { "TreeView", 1, 5 },
+
+    { "Slider", 1, 6 }
 };
 
 QtQuickControls1Plugin::QtQuickControls1Plugin(QObject *parent) : QQmlExtensionPlugin(parent)
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 1d7e92d2..4cff6352 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -51,7 +51,7 @@
 import QtQuick 2.6
 import QtTest 1.0
 import QtQuickControlsTests 1.0
-import QtQuick.Controls 1.4
+import QtQuick.Controls 1.6
 import QtQuick.Controls.Private 1.0
 import QtQuick.Controls.Styles 1.4
 
@@ -176,6 +176,13 @@ Item {
             slider.value = 0
             mouseWheel(slider, 5, 5, -40 * ratio, 0)
             compare(slider.value, slider.maximumValue)
+
+            // Mousewheel deactivated
+            slider.value = 0
+            slider.wheelEnabled = false
+            mouseWheel(slider, 5, 5, 4 * ratio, 0)
+            compare(slider.value, 0)
+
             slider.destroy()
         }