Fix Text eliding with implicit height and maximumLineCount.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Fri, 17 Feb 2012 02:26:21 +0000 (12:26 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 23 Feb 2012 03:06:04 +0000 (04:06 +0100)
commit924a9620d528da85dc19df7573d33ba4132e5a3a
treeff4ff9efceaf95df8ed0f4fec3b16c3379defa84
parentc5f65d859720c9345f995136301f6809bbb82867
Fix Text eliding with implicit height and maximumLineCount.

Ignore the height of the text if the element height is invalid.

Task-number: QTBUG-24293
Change-Id: I1646c3f64583da40e6166aeea24c2c4af42cb279
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
src/quick/items/qquicktext.cpp
tests/auto/qtquick2/qquicktext/data/multilineelide.qml
tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp