diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-04-20 11:21:45 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-20 16:21:08 +0200 |
| commit | 4c6d12e6d22c4b78885c6fe5ac0c1d64a87e3bcf (patch) | |
| tree | 2cd0e15b830b31786608a18552de4178a5d47966 /src/plugins/platforms/windows | |
| parent | e7da3a104cc95891ca76e7c58dfbfdcba8659996 (diff) | |
Fix missing Windows native fonts in QML applications
Windows native fonts were not getting rendered because the font engine
was cloned incorrectly for QRawFont, resulting in multi-engine instead
of the specific cloned engine.
Task-number: QTBUG-25410
Change-Id: I08f543e541739ac1b51f96f381ae1bb20b59399a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontengine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp index 94072622eb..e074f79c32 100644 --- a/src/plugins/platforms/windows/qwindowsfontengine.cpp +++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp @@ -1133,6 +1133,9 @@ QFontEngine *QWindowsFontEngine::cloneWithSize(qreal pixelSize) const if (!uniqueFamilyName.isEmpty()) request.family = uniqueFamilyName; request.pixelSize = pixelSize; + // Disable font merging, as otherwise createEngine will return a multi-engine + // instance instead of the specific engine we wish to clone. + request.styleStrategy |= QFont::NoFontMerging; QFontEngine *fontEngine = QWindowsFontDatabase::createEngine(QUnicodeTables::Common, request, 0, |