diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:39:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:39:42 +0200 |
commit | 850f5868b7eef9746c49570ed4c8bfb2c5177ecc (patch) | |
tree | 91de4ddc14c65e946b2a87b33a5596a95d4c89ec /src/imports/controls/TextArea.qml | |
parent | eb1b76053f2c6f35f8a33bec71536ca24651a711 (diff) | |
parent | 0bd5c342013bfae63f1a7e13a0f531cb0a2c8581 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I59e9e2044184f96f1e66577f6f639d028a825b9e
Diffstat (limited to 'src/imports/controls/TextArea.qml')
-rw-r--r-- | src/imports/controls/TextArea.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index af705c43..00a97957 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -65,7 +65,8 @@ T.TextArea { text: control.placeholderText font: control.font - color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor + opacity: 0.5 + color: control.palette.text verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight |