Fix multiline eliding and support eliding when height is set.
authorMartin Jones <martin.jones@nokia.com>
Mon, 28 Nov 2011 05:32:31 +0000 (15:32 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 28 Nov 2011 06:45:43 +0000 (07:45 +0100)
commit7d4a187bc7537b1f6d441aabc1bbcffafd7017e7
treeb83e4b2c78e5cc4bfe7795245e21ee6d56423752
parentfb237da846785b72df25c3c9e7e25d377ea308e0
Fix multiline eliding and support eliding when height is set.

Task-number: QTBUG-22920, QTBUG-22116

Change-Id: Ibe78ce1b0b438eec32955b986a8740f173cd082f
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
src/declarative/items/qquicktext.cpp
src/declarative/items/qquicktext_p_p.h
tests/auto/declarative/qquicktext/data/multilineelide.qml [new file with mode: 0644]
tests/auto/declarative/qquicktext/tst_qquicktext.cpp