aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktext/data
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den.exter@jollamobile.com>2013-05-31 12:13:40 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-31 09:56:42 +0200
commite171d1e8c4b4324374cb57a6d7d181a57fc17dbe (patch)
treec003e6bc4326aa77262f8aae8edc6ee9373d949e /tests/auto/quick/qquicktext/data
parent9f9330c524092e63cf5b490d193fd9172938526f (diff)
Fix assert when calculating the implicit width of truncated lines.
Guard against reading past the end of the final line. Task-number: QTBUG-31471 Change-Id: I489f742936ee16f12ad9762b7c0891bfa9377e21 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'tests/auto/quick/qquicktext/data')
-rw-r--r--tests/auto/quick/qquicktext/data/elideBeforeMaximumLineCount.qml10
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktext/data/elideBeforeMaximumLineCount.qml b/tests/auto/quick/qquicktext/data/elideBeforeMaximumLineCount.qml
new file mode 100644
index 0000000000..7f1ce705dd
--- /dev/null
+++ b/tests/auto/quick/qquicktext/data/elideBeforeMaximumLineCount.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+
+Text {
+ width: implicitWidth / 2
+ height: implicitHeight / 2
+ elide: Text.ElideRight
+ maximumLineCount: 4
+
+ text: "Line one\nLine two\nLine three\nLine four"
+}