diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-28 17:20:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-28 17:22:53 +0100 |
| commit | 8318deb165047d592523ec0b2fd10510d4953b37 (patch) | |
| tree | e80c082fbe6918e489f61d4f06deb29bbc12fa32 /src/imports/controls/TextArea.qml | |
| parent | 85dc3eb5d0e19d024083a9776d1ac8cf31d708ca (diff) | |
| parent | 135b5cdecaeaecb1f3afe01103eac5970399efa7 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
src/templates/qquickapplicationwindow_p.h
src/templates/qquickcombobox.cpp
src/templates/qquickcombobox_p.h
src/templates/qquickpopup.cpp
Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478
Diffstat (limited to 'src/imports/controls/TextArea.qml')
| -rw-r--r-- | src/imports/controls/TextArea.qml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index 8df44d5b..46b6bc6c 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -50,9 +50,10 @@ T.TextArea { padding: 6 leftPadding: 10 - color: enabled ? "#26282a" : "#c2c2c2" -// selectionColor: TODO -// selectedTextColor: TODO + opacity: enabled ? 1 : 0.2 + color: "#353637" + selectionColor: "#fddd5c" + selectedTextColor: color Text { id: placeholder |