diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-25 08:58:05 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-06-25 08:58:05 +0000 |
| commit | 746f0984ccdd0fc433c824b9ee2859dcd8f0a5e5 (patch) | |
| tree | 4686bcd0e4aae08e24db4935d1b777de3b1983a6 /src/imports/controls/fusion | |
| parent | 77c0ef6aafcdcc52cb2d07ce085ee4b3574c36d9 (diff) | |
| parent | 66a781692a4d21ba4c8a124cb4be84e4e2ffa742 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/TextArea.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/fusion/TextField.qml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/fusion/TextArea.qml b/src/imports/controls/fusion/TextArea.qml index 04b25cb3..d2469d28 100644 --- a/src/imports/controls/fusion/TextArea.qml +++ b/src/imports/controls/fusion/TextArea.qml @@ -72,5 +72,6 @@ T.TextArea { verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight + renderType: control.renderType } } diff --git a/src/imports/controls/fusion/TextField.qml b/src/imports/controls/fusion/TextField.qml index 12331dd6..6f5f49b3 100644 --- a/src/imports/controls/fusion/TextField.qml +++ b/src/imports/controls/fusion/TextField.qml @@ -71,6 +71,7 @@ T.TextField { verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight + renderType: control.renderType } background: Rectangle { |