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

Change-Id: I3eb4463f8d931257b3e5d5438361f38f2f5b21ce

11 files changed, 11 insertions, 3 deletions

diff --git a/src/imports/controls/imagine/RoundButton.qml b/src/imports/controls/imagine/RoundButton.qml
index b4d25343..b9f4ae06 100644
--- a/src/imports/controls/imagine/RoundButton.qml
+++ b/src/imports/controls/imagine/RoundButton.qml
@@ -55,6 +55,12 @@ T.RoundButton {
     rightPadding: background ? background.rightPadding : 0
     bottomPadding: background ? background.bottomPadding : 0
 
+    icon.width: 24
+    icon.height: 24
+    icon.color: control.enabled && control.flat && control.highlighted ? control.palette.highlight
+        : control.enabled && (control.down || control.checked || control.highlighted) && !control.flat
+        ? control.palette.brightText : control.flat ? control.palette.windowText : control.palette.buttonText
+
     contentItem: IconLabel {
         spacing: control.spacing
         mirrored: control.mirrored
@@ -63,7 +69,9 @@ T.RoundButton {
         icon: control.icon
         text: control.text
         font: control.font
-        color: control.palette.buttonText
+        color: control.enabled && control.flat && control.highlighted ? control.palette.highlight
+            : control.enabled && (control.down || control.checked || control.highlighted) && !control.flat
+            ? control.palette.brightText : control.flat ? control.palette.windowText : control.palette.buttonText
     }
 
     background: NinePatchImage {
diff --git a/src/imports/controls/imagine/design/imagine.sketch b/src/imports/controls/imagine/design/imagine.sketch
index eab0877b..31f07fce 100644
--- a/src/imports/controls/imagine/design/imagine.sketch
+++ b/src/imports/controls/imagine/design/imagine.sketch
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored.9.png
deleted file mode 100644
index 63e48ae2..00000000
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored.9.png
+++ /dev/null
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@2x.9.png
deleted file mode 100644
index eadedcd3..00000000
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@2x.9.png
+++ /dev/null
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@3x.9.png
deleted file mode 100644
index 140f0d33..00000000
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@3x.9.png
+++ /dev/null
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@4x.9.png
deleted file mode 100644
index 5db63bc6..00000000
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@4x.9.png
+++ /dev/null
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored.9.png
deleted file mode 100644
index 0f946e4b..00000000
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored.9.png
+++ /dev/null
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@2x.9.png
deleted file mode 100644
index 8e1a3f4d..00000000
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@2x.9.png
+++ /dev/null
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@3x.9.png
deleted file mode 100644
index e76b4a79..00000000
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@3x.9.png
+++ /dev/null
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@4x.9.png
deleted file mode 100644
index bd256696..00000000
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@4x.9.png
+++ /dev/null
diff --git a/src/imports/controls/imagine/qquickimageselector.cpp b/src/imports/controls/imagine/qquickimageselector.cpp
index dd8a0c2d..41cbc6f2 100644
--- a/src/imports/controls/imagine/qquickimageselector.cpp
+++ b/src/imports/controls/imagine/qquickimageselector.cpp
@@ -185,7 +185,7 @@ void QQuickImageSelector::setCache(bool cache)
 
 void QQuickImageSelector::write(const QVariant &value)
 {
-    setUrl(value.value<QUrl>());
+    setUrl(value.toUrl());
 }
 
 void QQuickImageSelector::setTarget(const QQmlProperty &property)
@@ -199,7 +199,7 @@ void QQuickImageSelector::classBegin()
 
 void QQuickImageSelector::componentComplete()
 {
-    setUrl(m_property.read().value<QUrl>());
+    setUrl(m_property.read().toUrl());
     m_complete = true;
     updateSource();
 }