Merge branch 'jb39102' into 'mer-5.6'

[qpa] Fix font loading in the offsreen plugin. Contributes to JB#39102 See merge request !31
sailfishos · Nov 9, 2017 · 950aeae · 950aeae
2 parents 70659f7 + 426a9b2
commit 950aeae
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
@@ -21,6 +21,8 @@ contains(QT_CONFIG, xlib):contains(QT_CONFIG, opengl):!contains(QT_CONFIG, openg
     SOURCES += qoffscreenintegration_dummy.cpp
 }
 
+contains(QT_CONFIG, fontconfig) DEFINES += Q_FONTCONFIGDATABASE
+
 PLUGIN_TYPE = platforms
 PLUGIN_CLASS_NAME = QOffscreenIntegrationPlugin
 !equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -