diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-01-20 11:41:57 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-01-20 11:41:57 (GMT) |
| commit | 3c902c0436c68d0c689a813fbef009ac4689b3c4 (patch) | |
| tree | ae8897b314de6c966da37aa576a17a3bab2764d8 /src | |
| parent | b28e104cd12f73f5b18244995176f678a9188364 (diff) | |
| download | Qt-3c902c0436c68d0c689a813fbef009ac4689b3c4.zip Qt-3c902c0436c68d0c689a813fbef009ac4689b3c4.tar.gz Qt-3c902c0436c68d0c689a813fbef009ac4689b3c4.tar.bz2 | |
Add font object to QStaticText
This will be needed by OpenVG paint engine, and is useful elsewhere.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 1 | ||||
| -rw-r--r-- | src/gui/text/qstatictext_p.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 307d2e6..4e8ab9d 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -330,6 +330,7 @@ namespace { QStaticTextItem *currentItem = (m_items + (m_itemCount - 1)); currentItem->fontEngine = ti.fontEngine; + currentItem->font = ti.font; currentItem->chars = ti.chars; currentItem->numChars = ti.num_chars; currentItem->numGlyphs = ti.glyphs.numGlyphs; diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h index 33d2d39..919589e 100644 --- a/src/gui/text/qstatictext_p.h +++ b/src/gui/text/qstatictext_p.h @@ -72,8 +72,9 @@ public: int numGlyphs; // 4 bytes per item int numChars; // 4 bytes per item QFontEngine *fontEngine; // 4 bytes per item + QFont font; // 8 bytes per item // ================ - // 24 bytes per item + // 32 bytes per item }; class QStaticText; |