From 2c9fb06b97dfdd32801b15a866fefcff60f5b56e Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 12 Oct 2016 09:54:07 +0200
Subject: [PATCH] QmlDesigner: Adding elide property to text

Task-number: QTCREATORBUG-13455
Change-Id: I7e333840ccf2b7dde85f25f60392158167798c54
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../HelperWidgets/StandardTextSection.qml          | 14 ++++++++++++++
 .../QtQuick/TextSpecifics.qml                      |  1 +
 2 files changed, 15 insertions(+)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/StandardTextSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/StandardTextSection.qml
index 987f126196b..e710af40c18 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/StandardTextSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/StandardTextSection.qml
@@ -33,6 +33,7 @@ Section {
     caption: qsTr("Text")
 
     property bool showIsWrapping: false
+    property bool showElide: false
     property bool showVerticalAlignment: false
     property bool useLineEdit: true
     property bool showFormatProperty: false
@@ -62,6 +63,19 @@ Section {
             model: ["NoWrap", "WordWrap", "WrapAnywhere", "WrapAtWordBoundaryOrAnywhere"]
         }
 
+        Label {
+            visible: showElide
+            text: qsTr("Elide")
+        }
+
+        ComboBox {
+            visible: showElide
+            Layout.fillWidth: true
+            backendValue: backendValues.elide
+            scope: "Text"
+            model: ["ElideNone", "ElideLeft", "ElideMiddle", "ElideRight"]
+        }
+
         Label {
             text: qsTr("Alignment")
         }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml
index fb6b271700e..03f29c520e8 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml
@@ -36,6 +36,7 @@ Column {
         showIsWrapping: true
         showVerticalAlignment: true
         showFormatProperty: true
+        showElide: true
     }
 
     Section {