From 8bc026ddcc01234a17143402084a14454bd920f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Tue, 11 Mar 2014 15:02:55 +0100
Subject: Ensure that QGuiApplication is inited before using QFontDatabase

Change-Id: I494c4fdfa49139316efac0f68f8d463c02056372
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/gui/text/qfontdatabase.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/gui/text/qfontdatabase.cpp')

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 3c2cf4fdcf..02b9e6d25c 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1227,6 +1227,9 @@ QString QFontDatabase::styleString(const QFontInfo &fontInfo)
 */
 QFontDatabase::QFontDatabase()
 {
+    if (!qApp || !QGuiApplicationPrivate::platformIntegration())
+        qFatal("QFontDatabase: Must construct a QGuiApplication before accessing QFontDatabase");
+
     QMutexLocker locker(fontDatabaseMutex());
     createDatabase();
     d = privateDb();
-- 
cgit v1.2.3