diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-18 21:28:33 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-23 09:14:24 +0200 |
commit | 266fab2a8920dc79e52555b81cf1708233c1b60f (patch) | |
tree | 4829c6903c95f7582abdfbb1265cf50c98381e35 /src/controls/ComboBox.qml | |
parent | 9578edd239f4f1e33d2bf5c044b1bf80ab2c595d (diff) | |
download | qtquickcontrols-266fab2a8920dc79e52555b81cf1708233c1b60f.tar.gz |
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>
Diffstat (limited to 'src/controls/ComboBox.qml')
-rw-r--r-- | src/controls/ComboBox.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 07d98876..9cb2a9f4 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -360,9 +360,9 @@ Control { renderType: __style ? __style.renderType : Text.NativeRendering selectByMouse: true - color: __style.__syspal.text - selectionColor: __style.__syspal.highlight - selectedTextColor: __style.__syspal.highlightedText + color: SystemPaletteSingleton.text(enabled) + selectionColor: SystemPaletteSingleton.highlight(enabled) + selectedTextColor: SystemPaletteSingleton.highlightedText(enabled) onAccepted: { var idx = input.find(editText, Qt.MatchFixedString) if (idx > -1) { |