From 565da6030fc2396d8d00baa65196cfc1f5d63f27 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 2 Apr 2012 11:41:28 +0200 Subject: 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 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/qplatformfontdatabase_qpa.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp index 6bd8284fa0..6af0398f00 100644 --- a/src/gui/text/qplatformfontdatabase_qpa.cpp +++ b/src/gui/text/qplatformfontdatabase_qpa.cpp @@ -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); -- cgit v1.2.3