diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-28 09:18:36 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-28 09:19:24 +0100 |
| commit | 83d36c3ff8eef06f2de214b453245d509a811f83 (patch) | |
| tree | 4513196ef2f9ee40c31f9ae1e4b06f778247c8b1 /src/gui/text/qfontdatabase_qpa.cpp | |
| parent | 9e64fc9e1cebf1e11694c4f536881128f5aee288 (diff) | |
| parent | 82a2d28d841c7f59fa76fae6a67e1712a5fb4740 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I860404a1ef18c88a968a9eded405bb67967047b9
Diffstat (limited to 'src/gui/text/qfontdatabase_qpa.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase_qpa.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp index fddbb11122..6c0be950dc 100644 --- a/src/gui/text/qfontdatabase_qpa.cpp +++ b/src/gui/text/qfontdatabase_qpa.cpp @@ -184,7 +184,6 @@ QFontEngine *loadSingleEngine(int script, if (!engine) { engine = pfdb->fontEngine(def, QChar::Script(script), size->handle); if (engine) { - engine->smoothScalable = style->smoothScalable; QFontCache::Key key(def,script); QFontCache::instance()->instance()->insertEngine(key,engine); } |