From 266fab2a8920dc79e52555b81cf1708233c1b60f Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Wed, 18 Jun 2014 21:28:33 +0200
Subject: Singleton SystemPalette

Each SystemPalette instance installs an event filter on the
application object. Avoid this by sharing a single SystemPalette
instance.

Change-Id: Ica9f8979b33e511c1238add3d689f380d0daa93c
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
---
 src/controls/Styles/Base/ComboBoxStyle.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/controls/Styles/Base/ComboBoxStyle.qml')

diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml
index 6bf8a391..de78dc02 100644
--- a/src/controls/Styles/Base/ComboBoxStyle.qml
+++ b/src/controls/Styles/Base/ComboBoxStyle.qml
@@ -168,7 +168,7 @@ Style {
             anchors.verticalCenter: parent.verticalCenter
             text: control.currentText
             renderType: cbStyle.renderType
-            color: __syspal.text
+            color: SystemPaletteSingleton.text(control.enabled)
             elide: Text.ElideRight
         }
     }
-- 
cgit v1.2.1