From 3c902c0436c68d0c689a813fbef009ac4689b3c4 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 20 Jan 2010 12:41:57 +0100 Subject: Add font object to QStaticText This will be needed by OpenVG paint engine, and is useful elsewhere. --- src/gui/text/qstatictext.cpp | 1 + src/gui/text/qstatictext_p.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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; -- cgit v0.12