From 4e800fafb151f6bbe92aa7b0ba5df5cc1e8f80a9 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Tue, 26 Nov 2013 19:18:37 +0100
Subject: Fix disabled text color of an editable ComboBox

Change-Id: I2b38fa17434796be65a88d7c8d14ff94a7e2b233
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
 src/controls/ComboBox.qml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index ad28efb5..d7a3d3d1 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -323,8 +323,9 @@ Control {
 
         renderType: Text.NativeRendering
         selectByMouse: true
-        selectionColor: syspal.highlight
-        selectedTextColor: syspal.highlightedText
+        color: __style.__syspal.text
+        selectionColor: __style.__syspal.highlight
+        selectedTextColor: __style.__syspal.highlightedText
         onAccepted: {
             var idx = input.find(editText)
             if (idx > -1) {
@@ -340,8 +341,6 @@ Control {
             comboBox.accepted();
         }
 
-        SystemPalette { id: syspal }
-
         property bool blockUpdate: false
         property string prevText
 
-- 
cgit v1.2.1