Merge remote-tracking branch 'origin/5.7' into dev

Change-Id: Ifd118c11fd6034d03b98c961313280b7098c5f84

7 files changed, 8 insertions, 8 deletions

diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index 3861629b..b412e926 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -143,7 +143,7 @@ T.ComboBox {
         }
 
         background: Rectangle {
-            radius: 3
+            radius: 2
             color: control.Material.dialogColor
 
             layer.enabled: control.enabled
diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml
index c7a2935a..c2f623ae 100644
--- a/src/imports/controls/material/Frame.qml
+++ b/src/imports/controls/material/Frame.qml
@@ -53,7 +53,7 @@ T.Frame {
     contentItem: Item { }
 
     background: Rectangle {
-        radius: 3
+        radius: 2
         color: control.Material.elevation > 0 ? control.Material.backgroundColor : "transparent"
         border.color: control.Material.frameColor
 
diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml
index 48380414..6d84197c 100644
--- a/src/imports/controls/material/GroupBox.qml
+++ b/src/imports/controls/material/GroupBox.qml
@@ -73,7 +73,7 @@ T.GroupBox {
         width: parent.width
         height: parent.height - control.topPadding + control.padding
 
-        radius: 3
+        radius: 2
         color: control.Material.elevation > 0 ? control.Material.backgroundColor : "transparent"
         border.color: control.Material.frameColor
 
diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml
index 6a02b25a..251492ea 100644
--- a/src/imports/controls/material/Pane.qml
+++ b/src/imports/controls/material/Pane.qml
@@ -54,7 +54,7 @@ T.Pane {
 
     background: Rectangle {
         color: control.Material.backgroundColor
-        radius: control.Material.elevation > 0 ? 3 : 0
+        radius: control.Material.elevation > 0 ? 2 : 0
 
         layer.enabled: control.enabled && control.Material.elevation > 0
         layer.effect: ElevationEffect {
diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml
index 04d15fa9..19fd6b79 100644
--- a/src/imports/controls/material/Popup.qml
+++ b/src/imports/controls/material/Popup.qml
@@ -69,7 +69,7 @@ T.Popup {
     contentItem: Item { }
 
     background: Rectangle {
-        radius: 3
+        radius: 2
         color: control.Material.dialogColor
 
         layer.enabled: control.Material.elevation > 0
diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index 8be0d432..3325f172 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -111,7 +111,7 @@ T.SpinBox {
         height: parent.height
         width: height
         padding: control.spacing
-        radius: 3
+        radius: 2
         color: Qt.tint(Qt.tint(control.Material.buttonColor,
                                control.activeFocus ? control.Material.buttonHoverColor : "transparent"),
                                control.up.pressed ? control.Material.buttonPressColor: "transparent")
@@ -139,7 +139,7 @@ T.SpinBox {
         height: parent.height
         width: height
         padding: control.spacing
-        radius: 3
+        radius: 2
         color: Qt.tint(Qt.tint(control.Material.buttonColor,
                                control.activeFocus ? control.Material.buttonHoverColor : "transparent"),
                                control.down.pressed ? control.Material.buttonPressColor : "transparent")
diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml
index 56cc7080..6781d387 100644
--- a/src/imports/controls/universal/Dial.qml
+++ b/src/imports/controls/universal/Dial.qml
@@ -64,7 +64,7 @@ T.Dial {
 
         radius: width / 2
         color: !control.enabled ? control.Universal.baseLowColor :
-                control.down ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor
+                control.pressed ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor
 
         transform: [
             Translate {