diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-04 14:11:21 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-04 14:11:21 +0100 |
| commit | 735b9de01d301c738acc7a0b26d5703d998941fb (patch) | |
| tree | 00ab2e8b84a1187fc4b620d4b3924b9e50641ce8 /src/imports/controls/universal/TextArea.qml | |
| parent | 340879d8263f9383d33ed4eb3271b00e54c13f47 (diff) | |
| parent | bce843844b8edabc4365d0ef7175b54551217631 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/templates/qquickpopup.cpp
Change-Id: Ic5cdde7a2d9daa0e616de999969a4399db23245b
Diffstat (limited to 'src/imports/controls/universal/TextArea.qml')
| -rw-r--r-- | src/imports/controls/universal/TextArea.qml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 4f3f8a34..80d62cf4 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -60,7 +60,6 @@ T.TextArea { activeFocus ? Universal.chromeBlackHighColor : Universal.baseHighColor selectionColor: Universal.accent selectedTextColor: Universal.chromeWhiteColor - renderType: Text.NativeRendering Text { id: placeholder @@ -76,7 +75,6 @@ T.TextArea { visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment - renderType: Text.NativeRendering elide: Text.ElideRight } |