diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2012-02-21 14:11:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-23 03:00:31 +0100 |
| commit | 12f0663dbda6ae56d3307493ca34212f601dd3aa (patch) | |
| tree | e3f9087898a31550fb36f9b8144a9f5ea0ecf7ca /src/quick/items/qquicktext_p_p.h | |
| parent | a08546507fe0ce356e4183e557d9408295c80610 (diff) | |
Fix font size calculation in headings in StyledText.
Calculate the font size correctly even when the size is specified
in pixels and update this size when the font changes.
Also make sure that the text layout's font is set before parsing.
Task-number: QTBUG-24458
Change-Id: Ida7723f6e4f4b9fd3a6878076f4beaf5bda8f7f7
Reviewed-by: Andrew den Exter <andrew.den-exter@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 555f41ff94..e060cc1cd2 100644 --- a/src/quick/items/qquicktext_p_p.h +++ b/src/quick/items/qquicktext_p_p.h @@ -148,6 +148,7 @@ public: bool layoutTextElided:1; bool textHasChanged:1; bool needToUpdateLayout:1; + bool formatModifiesFontSize:1; static const QChar elideChar; |