diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-10 14:50:28 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:28:30 +0000 |
| commit | fd89fb4566501b3b4a34e25fefa882e97498e3ff (patch) | |
| tree | d7bb747931c42d0e519bf29fc03e55b6e341490c /src/plugins/platforms/minimal/qminimalintegration.cpp | |
| parent | e33a382c33099437ad5407fb36f446799e5ea549 (diff) | |
Cleanup QT_NO_FONTCONFIG usage
Stop messing around with the define in pro files, and rely on
the configuration system. Disable fontconfig on Mac, which in practice
gives the same result as before.
Change-Id: Iea3aec127af96f221f4ee8682fb20a624332b82f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/minimal/qminimalintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 |