diff options
author | Alessandro Portale <alessandro.portale@nokia.com> | 2011-01-19 17:49:34 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-20 09:44:18 (GMT) |
commit | 76f4101e8b31537989f3fcf1ca8a21d1f0884318 (patch) | |
tree | bce88b6ffe7fb7064764cf1c5b37fd4ee0706300 /src/gui/text/qfontdatabase_s60.cpp | |
parent | 1600d0777f12e8dd180c9b32f192284f33468934 (diff) | |
download | Qt-76f4101e8b31537989f3fcf1ca8a21d1f0884318.zip Qt-76f4101e8b31537989f3fcf1ca8a21d1f0884318.tar.gz Qt-76f4101e8b31537989f3fcf1ca8a21d1f0884318.tar.bz2 |
Do not load aplication fonts on Symbian^1 and below
read http://bugreports.qt.nokia.com/browse/QTBUG-16514 for
a recipy to reboot the phone just by handling with fonts.
Symbian^1 is vulnerable, and Symbain^3 prevents a phone reboot.
Therefore, I prefer to disable the app font feature for
Symbian^1, until QTBUG-16514 us properly handled.
Task-Number: QTBUG-16514
(cherry picked from commit 25ac59fcf1bb03c9af9a2c967218c96c7c77361a)
Diffstat (limited to 'src/gui/text/qfontdatabase_s60.cpp')
-rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index e508810..06462c4 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -517,6 +517,9 @@ static inline void load(const QString &family = QString(), int script = -1) static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt) { + if (QSysInfo::symbianVersion() <= QSysInfo::SV_SF_2) + return; // See QTBUG-16514 for what 'font collisions' can cause in Symbian^1 and lower + if (QSymbianFontDatabaseExtrasImplementation::appFontLimitReached()) return; |