Fix multi-length string substitution.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Tue, 14 Feb 2012 07:02:55 +0000 (17:02 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 16 Feb 2012 05:36:38 +0000 (06:36 +0100)
commit7127120b68ec08296b6e2980d1c9ae1a34e5f28d
tree5923ca0723243598df85c1a095d5b942c09d94c6
parent990a95fa3760af233195f87281dfc354002284a0
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>
src/quick/items/qquicktext.cpp
src/quick/items/qquicktext_p_p.h
tests/auto/qtquick2/qquicktext/data/multilengthStrings.qml [new file with mode: 0644]
tests/auto/qtquick2/qquicktext/data/multilengthStringsWrapped.qml [new file with mode: 0644]
tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp