AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change fatal exit in QPlatformFontDatabase to a warning.

Browse Source 
Only warn if the folder containing the qpf2 files is not found.
The code path is triggered by the QPA 'minimal' plugin.

Change-Id: I12a32001ce867096627033b1d5fb894cab163853
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-04-02 11:41:28 +02:00 committed by Qt by Nokia
parent d354f7d514
commit 565da6030f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/text/qplatformfontdatabase_qpa.cpp
View File

@ -250,10 +250,10 @@ QPlatformFontDatabase::~QPlatformFontDatabase()
void QPlatformFontDatabase::populateFontDatabase() void QPlatformFontDatabase::populateFontDatabase()
{ {
QString fontpath = fontDir(); QString fontpath = fontDir();
if(!QFile::exists(fontpath)) { if(!QFile::exists(fontpath)) {
qFatal("QFontDatabase: Cannot find font directory %s - is Qt installed correctly?", qWarning("QFontDatabase: Cannot find font directory '%s' - is Qt installed correctly?",
qPrintable(fontpath)); qPrintable(QDir::toNativeSeparators(fontpath)));
return;
} }
QDir dir(fontpath); QDir dir(fontpath);