QPlatformFontDatabase: Add default fonts.

Add a default font accessor used to initalize QGuiApplication::font().
Add accessor for default font hash providing the defaults for
QApplication::font(const char *widgetClassName).

Change-Id: Ie4eb6edb251a81e81288ef480ae5550bd1125008
Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
Reviewed-on: http://codereview.qt.nokia.com/2567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 0e1b691b36..f5cb04ce80 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -101,7 +101,8 @@
 
 #include "qgesture.h"
 #include "private/qgesturemanager_p.h"
-
+#include "private/qguiapplication_p.h"
+#include "qplatformfontdatabase_qpa.h"
 #ifndef QT_NO_LIBRARY
 #include "qlibrary.h"
 #endif
@@ -514,7 +515,7 @@ PaletteHash *qt_app_palettes_hash()
     return app_palettes();
 }
 
-Q_GLOBAL_STATIC(FontHash, app_fonts)
+Q_GLOBAL_STATIC_WITH_INITIALIZER(FontHash, app_fonts, { *x = QGuiApplicationPrivate::platformIntegration()->fontDatabase()->defaultFonts(); } )
 FontHash *qt_app_fonts_hash()
 {
     return app_fonts();