diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-07-09 15:52:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 03:24:53 +0200 |
| commit | 69fb70f6b3c88d4d2bb5ca97dbb7f77f42c828c5 (patch) | |
| tree | 2c8bbc3fe4d470fd102a722af19c841a02db9031 /src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h | |
| parent | fafc1c3dc3eed3c331f5213f5238480335a346ee (diff) | |
Support fallback fonts in DirectWrite font engine
When selecting fallback fonts for a DirectWrite font, we would
cast the font engine to QWindowsFontEngine and get unpredictable
results and crashes. This change factors out getting the LOGFONT
data from the QFontDef struct and will use this to create a new
DirectWrite engine.
Task-number: QTBUG-22658
Change-Id: I743944d9a44d8742b47b1aa3354532493362cc4a
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h index f5f20d57ce..32444c7cb0 100644 --- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h +++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h @@ -99,6 +99,8 @@ public: bool canRender(const QChar *string, int len); Type type() const; + const QSharedPointer<QWindowsFontEngineData> &fontEngineData() const { return m_fontEngineData; } + static QString fontNameSubstitute(const QString &familyName); private: |