diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-25 10:49:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 10:49:57 +0200 |
| commit | 66a781692a4d21ba4c8a124cb4be84e4e2ffa742 (patch) | |
| tree | 4fe9261e26281ddb5f1444563cda53c8bf39d978 /src/imports/controls/imagine | |
| parent | 7fec7105b7f6119135aafd6f9ee609128125d594 (diff) | |
| parent | d5fbbddd7794265f24d392d33c4874ac756cb9c9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/imports/controls/imagine/TextArea.qml
src/imports/controls/imagine/TextField.qml
tests/auto/controls/data/tst_tumbler.qml
Change-Id: I25a8228a4299fb7a53db70b7223663a1637ed933
Diffstat (limited to 'src/imports/controls/imagine')
| -rw-r--r-- | src/imports/controls/imagine/TextArea.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/imagine/TextField.qml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/imagine/TextArea.qml b/src/imports/controls/imagine/TextArea.qml index c50b2f18..94fe237c 100644 --- a/src/imports/controls/imagine/TextArea.qml +++ b/src/imports/controls/imagine/TextArea.qml @@ -80,6 +80,7 @@ T.TextArea { verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight + renderType: control.renderType } background: NinePatchImage { diff --git a/src/imports/controls/imagine/TextField.qml b/src/imports/controls/imagine/TextField.qml index 94298fbc..2943396e 100644 --- a/src/imports/controls/imagine/TextField.qml +++ b/src/imports/controls/imagine/TextField.qml @@ -79,6 +79,7 @@ T.TextField { verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight + renderType: control.renderType } background: NinePatchImage { |