diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 09:18:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 09:12:50 +0000 |
| commit | ed30fdd7085ee8a007b990dc871afdeef0d7cbeb (patch) | |
| tree | 2a6b368c1259b29f40eade92e0273b437efc15e8 /src/imports/controls/universal/TextField.qml | |
| parent | 4c715a9c74bd871dfdea203238e6b7b72a3a736c (diff) | |
Correct placeholderText.visible with preeditText
Both for TextArea and TextField.
Task-number: QTBUG-50412
Change-Id: I273c8520482ef288ee28c7cbb54e5d96623f7900
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal/TextField.qml')
| -rw-r--r-- | src/imports/controls/universal/TextField.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index 1f066220..a0c854b2 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -74,7 +74,7 @@ T.TextField { font: control.font color: !control.enabled ? control.Universal.chromeDisabledLowColor : control.activeFocus ? control.Universal.chromeBlackMediumLowColor : control.Universal.baseMediumColor - visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment renderType: Text.NativeRendering |