diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-03-05 09:00:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-05 13:46:15 +0100 |
| commit | 9f1089531d75b0a831e03c3a31ef8b4e5c0b54f4 (patch) | |
| tree | 1e3013e61f71c9a872507993256d7c2c07452af9 /src/gui/text/qfontengine_qpa.cpp | |
| parent | e69284db08966cbe907df4b3cdc58fb9f9ee5dc4 (diff) | |
Make QFontEngine::type() non-virtual
Change-Id: I24ece90d6d8f96dad0c41a474a491b4ea96d97c3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui/text/qfontengine_qpa.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_qpa.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp index b0bfd02448..e9252b328e 100644 --- a/src/gui/text/qfontengine_qpa.cpp +++ b/src/gui/text/qfontengine_qpa.cpp @@ -237,7 +237,8 @@ static inline unsigned int getChar(const QChar *str, int &i, const int len) } QFontEngineQPA::QFontEngineQPA(const QFontDef &def, const QByteArray &data) - : fontData(reinterpret_cast<const uchar *>(data.constData())), dataSize(data.size()) + : QFontEngine(QPF2), + fontData(reinterpret_cast<const uchar *>(data.constData())), dataSize(data.size()) { fontDef = def; cache_cost = 100; @@ -510,11 +511,6 @@ QFixed QFontEngineQPA::lineThickness() const return QFixed::fromReal(extractHeaderField(fontData, Tag_LineThickness).value<qreal>()); } -QFontEngine::Type QFontEngineQPA::type() const -{ - return QFontEngine::QPF2; -} - bool QFontEngineQPA::isValid() const { return fontData && dataSize && (cmapOffset || externalCMap) |