diff options
Diffstat (limited to 'src/plugins/platforms/minimal')
-rw-r--r-- | src/plugins/platforms/minimal/minimal.pro | 1 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index 3aca27b555..0d31d6605b 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -11,7 +11,6 @@ HEADERS = qminimalintegration.h \ OTHER_FILES += minimal.json CONFIG += qpa/genericunixfontdatabase -win32|darwin: DEFINES += QT_NO_FONTCONFIG PLUGIN_TYPE = platforms PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 7224f4114c..984d4456a0 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -46,10 +46,10 @@ #if defined(Q_OS_WIN) #include <QtPlatformSupport/private/qbasicfontdatabase_p.h> -#elif defined(QT_NO_FONTCONFIG) -#include <qpa/qplatformfontdatabase.h> -#else +#elif QT_CONFIG(fontconfig) #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h> +#else +#include <qpa/qplatformfontdatabase.h> #endif #if !defined(Q_OS_WIN) @@ -118,7 +118,7 @@ public: QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const { if (m_options & EnableFonts) { -#ifndef QT_NO_FONTCONFIG +#if QT_CONFIG(fontconfig) if (!m_fontDatabase) m_fontDatabase = new QGenericUnixFontDatabase; #else |