diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-09-16 16:11:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-19 08:38:17 +0200 |
| commit | 1aaf08691dd1e1a9b5124b2835aaf121ab2b370a (patch) | |
| tree | 4dbbde9efc9b698cc818235e78d4b0f718def632 /src/gui | |
| parent | e63b6f113c150c51ab2d054991bfef2394e84eaa (diff) | |
Treat QTestFontEngine properly
Do not try to fill fontDef when it's a test font engine, otherwise
it will cause a crash because desc.family is 0.
Change-Id: I008b784bae3e60a25c33c285d944442a3616a9a2
Reviewed-on: http://codereview.qt-project.org/5103
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontdatabase_qpa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp index c0edce1009..3a578e746f 100644 --- a/src/gui/text/qfontdatabase_qpa.cpp +++ b/src/gui/text/qfontdatabase_qpa.cpp @@ -260,7 +260,7 @@ QFontDatabase::findFont(int script, const QFontPrivate *fp, FM_DEBUG(" NO MATCH FOUND\n"); } - if (engine) { + if (engine && engine->type() != QFontEngine::TestFontEngine) { initFontDef(desc, request, &engine->fontDef); if (fp) { |