Fix colorized high-DPI indicators

qtdeclarative commit f8c53e88 (Fix high-DPI image and svg providers)
changed the way high-DPI image providers work. For images using an
image provider, we must now set the source size to get the desired
device pixel ratio...

Change-Id: I47a90a9678ad43a54073d2cf1a2420925770c3ea
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

7 files changed, 16 insertions, 0 deletions

diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml
index 5f75181e..69a5e266 100644
--- a/src/imports/controls/CheckIndicator.qml
+++ b/src/imports/controls/CheckIndicator.qml
@@ -52,6 +52,8 @@ Rectangle {
         x: (parent.width - width) / 2
         y: (parent.height - height) / 2
         source: "image://default/check/" + (control.visualFocus ? "#0066ff" : "#353637")
+        sourceSize.width: width
+        sourceSize.height: height
         visible: control.checkState === Qt.Checked
     }
 
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index ed723c09..18092a83 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -70,6 +70,8 @@ T.ComboBox {
         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
         y: control.topPadding + (control.availableHeight - height) / 2
         source: "image://default/double-arrow/" + (control.visualFocus ? "#0066ff" : "#353637")
+        sourceSize.width: width
+        sourceSize.height: height
     }
     //! [indicator]
 
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index 9db51384..aa138126 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -63,6 +63,8 @@ T.Dial {
         width: 14
         height: 10
         source: "image://default/dial-indicator/" + (control.visualFocus ? "#0066ff" : "#353637")
+        sourceSize.width: width
+        sourceSize.height: height
         antialiasing: true
         opacity: control.enabled ? 1 : 0.3
         transform: [
diff --git a/src/imports/controls/universal/CheckIndicator.qml b/src/imports/controls/universal/CheckIndicator.qml
index a508ad18..eeecf264 100644
--- a/src/imports/controls/universal/CheckIndicator.qml
+++ b/src/imports/controls/universal/CheckIndicator.qml
@@ -58,6 +58,8 @@ Rectangle {
 
         visible: control.checkState === Qt.Checked
         source: "image://universal/checkmark/" + (!control.enabled ? control.Universal.baseLowColor : control.Universal.chromeWhiteColor)
+        sourceSize.width: width
+        sourceSize.height: height
     }
 
     Rectangle {
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index 633abf47..113ce24b 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -69,6 +69,8 @@ T.ComboBox {
         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
         y: control.topPadding + (control.availableHeight - height) / 2
         source: "image://universal/downarrow/" + (!control.enabled ? control.Universal.baseLowColor : control.Universal.baseMediumHighColor)
+        sourceSize.width: width
+        sourceSize.height: height
     }
     //! [indicator]
 
diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml
index c8561cbf..843e96b0 100644
--- a/src/imports/controls/universal/MenuItem.qml
+++ b/src/imports/controls/universal/MenuItem.qml
@@ -76,6 +76,8 @@ T.MenuItem {
 
         visible: control.checked
         source: !control.checkable ? "" : "image://universal/checkmark/" + (!control.enabled ? control.Universal.baseLowColor : control.down ? control.Universal.baseHighColor : control.Universal.baseMediumHighColor)
+        sourceSize.width: width
+        sourceSize.height: height
     }
     //! [indicator]
 
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml
index 4b9b4810..cb79bb5e 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/imports/controls/universal/SpinBox.qml
@@ -107,6 +107,8 @@ T.SpinBox {
             source: "image://universal/" + (control.mirrored ? "left" : "right") + "arrow/"
                     + (!control.enabled ? control.Universal.chromeDisabledLowColor :
                                           control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
+            sourceSize.width: width
+            sourceSize.height: height
         }
     }
     //! [up.indicator]
@@ -133,6 +135,8 @@ T.SpinBox {
             source: "image://universal/" + (control.mirrored ? "right" : "left") + "arrow/"
                     + (!control.enabled ? control.Universal.chromeDisabledLowColor :
                                           control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
+            sourceSize.width: width
+            sourceSize.height: height
         }
     }
     //! [down.indicator]