diff --git a/src/platformsupport/fontdatabases/fontdatabases.pro b/src/platformsupport/fontdatabases/fontdatabases.pro index 9376c3b..8dd1adf 100644 --- a/src/platformsupport/fontdatabases/fontdatabases.pro +++ b/src/platformsupport/fontdatabases/fontdatabases.pro @@ -23,6 +23,9 @@ darwin:!if(watchos:CONFIG(simulator, simulator|device)) { win32:!winrt { include($$PWD/windows/windows.pri) + qtConfig(fontconfig) { + include($$PWD/fontconfig/fontconfig.pri) + } } winrt { diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 03c7250..f944ae0 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -44,10 +44,10 @@ #include #include -#if defined(Q_OS_WIN) -#include -#elif QT_CONFIG(fontconfig) +#if QT_CONFIG(fontconfig) #include +#elif defined(Q_OS_WIN) +#include #else #include #endif