Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml

@@ -67,7 +67,7 @@ SpinBoxStyle {
     }
 
     background: Rectangle {
-        implicitWidth: Math.max(60, styleData.contentWidth)
+        implicitWidth: Math.max(64, styleData.contentWidth)
         implicitHeight: 23
         border.color: borderColor
         radius: 3

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SliderSpinBox.qml

@@ -39,79 +39,6 @@ SpinBox {
     property color highlightColor: "orange"
     property color textColor: "#eee"
 
-    function showSlider() {
-        timer.stop()
-        timer2.start()
-        slider.opacity = 1;
-    }
-
-    onHoveredChanged: {
-        if (hovered)
-            showSlider();
-    }
-
-    Slider {
-        id: slider
-
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.bottom
-        height: 10;
-        //opacity: 0
-
-        maximumValue: spinBox.maximumValue
-        minimumValue: spinBox.minimumValue
-
-        value: spinBox.value
-        visible: false
-
-        onValueChanged: {
-            spinBox.value = value
-        }
-
-        Behavior on opacity {
-            PropertyAnimation {
-                duration: 100
-            }
-        }
-
-        onHoveredChanged:  {
-            if (!hovered) {
-                timer.startTimer();
-            } else {
-                timer2.stop()
-                timer.stop()
-            }
-        }
-    }
-
-    Timer {
-        id: timer
-        repeat: false
-        function startTimer() {
-            if (!timer.running)
-                timer.start()
-        }
-        interval: 600
-
-        onTriggered: {
-            return
-            if (!slider.hovered)
-                slider.opacity = 0;
-        }
-    }
-
-    Timer {
-        id: timer2
-        repeat: false
-        interval: 1000
-        onTriggered: {
-            return
-            if (!slider.hovered)
-                slider.opacity = 0;
-        }
-    }
-
     style: CustomSpinBoxStyle {
 
     }

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml

@@ -63,25 +63,6 @@ Controls.SpinBox {
             backendValue.value = value;
     }
 
-    Controls.Slider {
-        id: slider
-
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.bottom
-        height: 10
-        visible: false
-
-        maximumValue: spinBox.maximumValue
-        minimumValue: spinBox.minimumValue
-
-        value: spinBox.value
-
-        onValueChanged: {
-            spinBox.value = value
-        }
-    }
-
     style: CustomSpinBoxStyle {
     }
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml

@@ -51,7 +51,7 @@ Column {
             SecondColumnLayout {
                 SpinBox {
                     backendValue: backendValues.dragMargin
-                    minimumValue: 100;
+                    minimumValue: 0;
                     maximumValue: 100;
                     decimals: 0
                 }