aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktext/data
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@live.com>2015-02-02 11:23:31 -0600
committerMichael Brasser <michael.brasser@live.com>2015-02-03 14:46:57 +0000
commit3b2e59130bf264ec63bf51b2049989f697d91ca1 (patch)
tree0e58a0762a92982d6e3204328e3b287b8cf8203f /tests/auto/quick/qquicktext/data
parent81b876b7177cf0d55b7c009342e501bfa900175c (diff)
Fix Text wrapping when growing from 0 width.
The fix for QTBUG-30896 caused a regression in the test case. Now check both width and implicit width validity before resetting widthExceeded. Change-Id: I4aba2aad299746906cfe20e288fa60cfe2acc64f Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'tests/auto/quick/qquicktext/data')
-rw-r--r--tests/auto/quick/qquicktext/data/growFromZeroWidth.qml8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktext/data/growFromZeroWidth.qml b/tests/auto/quick/qquicktext/data/growFromZeroWidth.qml
new file mode 100644
index 0000000000..a264191e45
--- /dev/null
+++ b/tests/auto/quick/qquicktext/data/growFromZeroWidth.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+Text {
+ width: 0
+ wrapMode: Text.Wrap
+ horizontalAlignment: Text.AlignHCenter
+ text: "AA\nBBBBBBB\nCCCCCCCCCCCCCCCC"
+}