summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-23 01:00:23 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-23 01:00:23 +0100
commita5e4a67e8b5138290cc7db469c69b13bedd4a837 (patch)
treedb104930222b9ff7065d735658d6536761a182d6 /src/platformsupport/fontdatabases
parent2c871dfd38d89d6415c2c25d47b4a0e9c8b2ef11 (diff)
parent935681eaca1229f100e54f7447be0e23ceba684b (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/platformsupport/fontdatabases')
-rw-r--r--src/platformsupport/fontdatabases/fontdatabases.pro7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/platformsupport/fontdatabases/fontdatabases.pro b/src/platformsupport/fontdatabases/fontdatabases.pro
index f2bac9ab94..c3985ed398 100644
--- a/src/platformsupport/fontdatabases/fontdatabases.pro
+++ b/src/platformsupport/fontdatabases/fontdatabases.pro
@@ -17,9 +17,10 @@ qtConfig(freetype) {
unix {
include($$PWD/genericunix/genericunix.pri)
- qtConfig(fontconfig) {
- include($$PWD/fontconfig/fontconfig.pri)
- }
+}
+
+qtConfig(fontconfig) {
+ include($$PWD/fontconfig/fontconfig.pri)
}
win32:!winrt {