Change fatal exit in QPlatformFontDatabase to a warning.
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:
parent
d354f7d514
commit
565da6030f
@ -250,10 +250,10 @@ QPlatformFontDatabase::~QPlatformFontDatabase()
|
||||
void QPlatformFontDatabase::populateFontDatabase()
|
||||
{
|
||||
QString fontpath = fontDir();
|
||||
|
||||
if(!QFile::exists(fontpath)) {
|
||||
qFatal("QFontDatabase: Cannot find font directory %s - is Qt installed correctly?",
|
||||
qPrintable(fontpath));
|
||||
qWarning("QFontDatabase: Cannot find font directory '%s' - is Qt installed correctly?",
|
||||
qPrintable(QDir::toNativeSeparators(fontpath)));
|
||||
return;
|
||||
}
|
||||
|
||||
QDir dir(fontpath);
|
||||
|
Loading…
Reference in New Issue
Block a user