summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-04-24 05:29:07 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-05-01 05:36:04 +0000
commit9bf6ea7fde7228c8fcc669162969120a356b4d15 (patch)
treebfd55af21c5f499ab73ff5e80751eb5056ed9a46 /src/gui/text
parentaf217e67fa024e4ad9d492ef7af4fe8005993d3f (diff)
[QFontDatabase] Get rid of some dead code
1. Checking if `db->count == 0` inside the `for (int x = 0; x < db->count; ++x)` loop makes absolutely no sense; 2. The family gets loaded just a line above (ensurePopulated()). Change-Id: I72dbd42565c4f5a5d9ff8879f10ee0ece7298fa7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontdatabase.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 0f3cb21c70..af3fe72948 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1181,9 +1181,6 @@ static int match(int script, const QFontDef &request,
test.family->ensurePopulated();
- if (family_name.isEmpty())
- load(test.family->name, script);
-
// Check if family is supported in the script we want
if (writingSystem != QFontDatabase::Any && !(test.family->writingSystems[writingSystem] & QtFontFamily::Supported))
continue;