Fix multi-length string substitution.

Multi-length string eliding was provided by QFontMetrics::elidedText()
which is no longer used for layouts.  So we instead have to do the
string substitution ourselves if the text doesn't fit before finally
eliding.

Change-Id: Iab2e54b332390290d656299a5be148f39f78df9d
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/auto/qtquick2/qquicktext/data/multilengthStringsWrapped.qml b/tests/auto/qtquick2/qquicktext/data/multilengthStringsWrapped.qml
new file mode 100644
index 0000000000..0da9bc353a
--- /dev/null
+++ b/tests/auto/qtquick2/qquicktext/data/multilengthStringsWrapped.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.0
+
+Item {
+    width: 300
+    height: 200
+
+    Text {
+        id: myText
+        objectName: "myText"
+        width: 100
+        height: 36
+        font.pixelSize: 15
+        font.family: "Helvetica"
+        wrapMode: Text.Wrap
+    }
+}