Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0

Change-Id: Iacaf1656f2a66df0a97641f855aaf4d9d9189e6d

1 files changed, 29 insertions, 0 deletions

diff --git a/src/imports/controls/designer/DialSpecifics.qml b/src/imports/controls/designer/DialSpecifics.qml
index 52bba078..6c9bda34 100644
--- a/src/imports/controls/designer/DialSpecifics.qml
+++ b/src/imports/controls/designer/DialSpecifics.qml
@@ -55,6 +55,7 @@ Column {
                     minimumValue: Math.min(backendValues.from.value, backendValues.to.value)
                     maximumValue: Math.max(backendValues.from.value, backendValues.to.value)
                     decimals: 2
+                    stepSize: 0.1
                     backendValue: backendValues.value
                     Layout.fillWidth: true
                 }
@@ -69,6 +70,7 @@ Column {
                     maximumValue: 9999999
                     minimumValue: -9999999
                     decimals: 2
+                    stepSize: 0.1
                     backendValue: backendValues.from
                     Layout.fillWidth: true
                 }
@@ -83,6 +85,7 @@ Column {
                     maximumValue: 9999999
                     minimumValue: -9999999
                     decimals: 2
+                    stepSize: 0.1
                     backendValue: backendValues.to
                     Layout.fillWidth: true
                 }
@@ -97,10 +100,36 @@ Column {
                     maximumValue: 9999999
                     minimumValue: -9999999
                     decimals: 2
+                    stepSize: 0.1
                     backendValue: backendValues.stepSize
                     Layout.fillWidth: true
                 }
             }
+
+            Label {
+                text: qsTr("Snap Mode")
+                tooltip: qsTr("The snap mode of the dial.")
+            }
+            SecondColumnLayout {
+                ComboBox {
+                    backendValue: backendValues.orientation
+                    model: [ "NoSnap", "SnapOnRelease", "SnapAlways" ]
+                    scope: "Dial"
+                    Layout.fillWidth: true
+                }
+            }
+
+            Label {
+                text: qsTr("Live")
+                tooltip: qsTr("Whether the dial provides live value updates.")
+            }
+            SecondColumnLayout {
+                CheckBox {
+                    text: backendValues.live.valueToString
+                    backendValue: backendValues.live
+                    Layout.fillWidth: true
+                }
+            }
         }
     }