1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that QGuiApplication is inited before using QFontDatabase

Browse Source 
Change-Id: I494c4fdfa49139316efac0f68f8d463c02056372
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Tor Arne Vestbø 2014-03-11 15:02:55 +01:00 committed by The Qt Project
parent b9ec3e895f
commit 8bc026ddcc
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/text/qfontdatabase.cpp
View File

@ -1227,6 +1227,9 @@ QString QFontDatabase::styleString(const QFontInfo &fontInfo)
*/ */
QFontDatabase::QFontDatabase() QFontDatabase::QFontDatabase()
{ {
if (!qApp || !QGuiApplicationPrivate::platformIntegration())
qFatal("QFontDatabase: Must construct a QGuiApplication before accessing QFontDatabase");
QMutexLocker locker(fontDatabaseMutex()); QMutexLocker locker(fontDatabaseMutex());
createDatabase(); createDatabase();
d = privateDb(); d = privateDb();