summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-11-08 15:17:18 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-08 15:52:28 +0100
commit1c70cd998093aa1ba79af0fa1eed5f30da47354d (patch)
tree3b9362d6de97171ef41db8ff6f889089e6438358 /src
parent7a78248e9cbce223364ad39070629ede2f80a3a4 (diff)
Avoid double initialize of platform font database
Since platform font database will be populated in QFontDatabase::load, no need to do it here in QFont::initialize. The change was in cd781b732ed29b41b5ac18e39cbbba2815fc8f8b but lost in previous merge. Change-Id: Iaa56fea5765d94e4f7b58409654bc218808086cd Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qfont_qpa.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qfont_qpa.cpp b/src/gui/text/qfont_qpa.cpp
index d6a73cfcf4..28fd77df56 100644
--- a/src/gui/text/qfont_qpa.cpp
+++ b/src/gui/text/qfont_qpa.cpp
@@ -46,7 +46,6 @@ QT_BEGIN_NAMESPACE
void QFont::initialize()
{
- QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFontDatabase();
}
void QFont::cleanup()