diff options
| author | Martin Klapetek <mklapetek@kde.org> | 2013-12-03 11:59:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-04 14:31:15 +0100 |
| commit | 83da719c2d2cdea18574de85e5a49037a0466f0a (patch) | |
| tree | 148f6ad5580d224610bc17f71d121f4d9358bb9b /src/controls/Styles/Desktop | |
| parent | 8bea832b49c059f167a3797083e7b0b82217fb00 (diff) | |
| download | qtquickcontrols-83da719c2d2cdea18574de85e5a49037a0466f0a.tar.gz | |
Fix disabled text color of TextArea
Change-Id: I5d09aa0da0675bce961f6445982cae16b894dbf1
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/Styles/Desktop')
| -rw-r--r-- | src/controls/Styles/Desktop/TextAreaStyle.qml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/controls/Styles/Desktop/TextAreaStyle.qml b/src/controls/Styles/Desktop/TextAreaStyle.qml index 3f2904a3..dbcd4dce 100644 --- a/src/controls/Styles/Desktop/TextAreaStyle.qml +++ b/src/controls/Styles/Desktop/TextAreaStyle.qml @@ -43,17 +43,15 @@ import QtQuick.Controls.Private 1.0 ScrollViewStyle { property font font: __styleitem.font - property color textColor: __styleitem.textColor + property color textColor: __syspal.text property color selectionColor: __syspal.highlight property color selectedTextColor: __syspal.highlightedText property color backgroundColor: control.backgroundVisible ? __syspal.base : "transparent" property StyleItem __styleitem: StyleItem{ - property color textColor: styleHint("textColor") elementType: "edit" visible: false active: control.activeFocus - onActiveChanged: textColor = styleHint("textColor") } property int renderType: Text.NativeRendering |