summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase_qpa.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-11-28 10:08:55 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-28 11:21:44 +0100
commitdccacf13db0e66d7d51a2ca6cfa168d644c7af55 (patch)
tree9a98090afef77cde334d4622d3b0f89967f52980 /src/gui/text/qfontdatabase_qpa.cpp
parentf29e38f9a433ce7e47eb9ec88927b184c856dd6d (diff)
parent83d36c3ff8eef06f2de214b453245d509a811f83 (diff)
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/gui/text/qfontdatabase_qpa.cpp')
-rw-r--r--src/gui/text/qfontdatabase_qpa.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp
index 98e89a8327..6f4971e267 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);
}