diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-14 17:02:55 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-16 06:36:38 +0100 |
| commit | 7127120b68ec08296b6e2980d1c9ae1a34e5f28d (patch) | |
| tree | 5923ca0723243598df85c1a095d5b942c09d94c6 /src/quick/items/qquicktext_p_p.h | |
| parent | 990a95fa3760af233195f87281dfc354002284a0 (diff) | |
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>
Diffstat (limited to 'src/quick/items/qquicktext_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktext_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h index 6fdde31a36..0a7fc743b5 100644 --- a/src/quick/items/qquicktext_p_p.h +++ b/src/quick/items/qquicktext_p_p.h @@ -104,6 +104,7 @@ public: int maximumLineCount; int maximumLineCountValid; QQuickText::FontSizeMode fontSizeMode; + int multilengthEos; int minimumPixelSize; int minimumPointSize; QPointF elidePos; |