diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-09-02 15:10:29 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2014-09-03 14:38:18 +0200 |
| commit | 5cb21215c972e6ea406bd3e9c0461a0683edfa71 (patch) | |
| tree | eec569356a27cdcab34d147274d77c256b4973a4 | |
| parent | 7af329fdf2ab25c38858fed8bb33e4fa0200766f (diff) | |
Change a qFatal to a qWarning
There are valid uses cases how to use Qt without installing
any fonts (e.g. by using an application font), so let's
make the warning non fatal.
Task-number: QTBUG-29192
Change-Id: I5684331b687bef4b8a54be1f68303c80aa8d4372
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| -rw-r--r-- | src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index 26ae0eb724..75359fbaa3 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -96,8 +96,9 @@ void QBasicFontDatabase::populateFontDatabase() QString fontpath = fontDir(); 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)); + return; } QDir dir(fontpath); |