diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-11-26 19:18:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-27 14:03:53 +0100 |
| commit | 4e800fafb151f6bbe92aa7b0ba5df5cc1e8f80a9 (patch) | |
| tree | 9f60519fbd6e54a4097e086cac923e009fcdefc5 | |
| parent | 80eb5897bb3b578e4c88eff32fe33e908408ebbe (diff) | |
| download | qtquickcontrols-4e800fafb151f6bbe92aa7b0ba5df5cc1e8f80a9.tar.gz qtquickcontrols-4e800fafb151f6bbe92aa7b0ba5df5cc1e8f80a9.tar.bz2 qtquickcontrols-4e800fafb151f6bbe92aa7b0ba5df5cc1e8f80a9.zip | |
Fix disabled text color of an editable ComboBox
Change-Id: I2b38fa17434796be65a88d7c8d14ff94a7e2b233
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| -rw-r--r-- | src/controls/ComboBox.qml | 7 |
1 files 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 |