diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:06 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:06 +0100 |
| commit | 675c150a28ae9f1ca5f4960caeed522da534f6fc (patch) | |
| tree | f29de6db23985893ed21c8caaf2fbc1e10aa063b /src/imports/controls/fusion/TextArea.qml | |
| parent | e052684db6e0814a6a3397eb21e3ce9f922563da (diff) | |
| parent | 95b4996a04989aa26c8fba8aaa90b76b7166c2c1 (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I2934d3f51fea9626fd2d2512786eb297d9f7fe6c
Diffstat (limited to 'src/imports/controls/fusion/TextArea.qml')
| -rw-r--r-- | src/imports/controls/fusion/TextArea.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/fusion/TextArea.qml b/src/imports/controls/fusion/TextArea.qml index 56541d89..36d9db04 100644 --- a/src/imports/controls/fusion/TextArea.qml +++ b/src/imports/controls/fusion/TextArea.qml @@ -68,7 +68,7 @@ T.TextArea { opacity: 0.5 text: control.placeholderText font: control.font - color: control.palette.text + color: control.color verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight |