diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-29 11:02:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-12 14:25:27 +0200 |
| commit | 1053e1f4a3cf681eadcf5a4774b18372738db2f5 (patch) | |
| tree | 0ae844334ec49a74e7fe1863dd9646f3e43f495d /src/plugins/platforms/windows/qwindowsintegration.cpp | |
| parent | 8a65cd8dcdb08c18230de3b2c73b4d127d6e88c5 (diff) | |
Fix Windows Font database code to use configure features
Use QT_CONFIG, QT_REQUIRE_CONFIG instead of custom macros.
Task-number: QTBUG-83255
Task-number: QTBUG-83931
Change-Id: Id067448dd59f4810a6bc8042d3fbe4244d5cc88a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 9503d48bdb..295bce1058 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -48,7 +48,8 @@ #include "qwindowsscreen.h" #include "qwindowstheme.h" #include "qwindowsservices.h" -#ifdef QT_USE_DIRECTWRITE3 +#include <QtGui/private/qtgui-config_p.h> +#if QT_CONFIG(directwrite3) #include <QtGui/private/qwindowsdirectwritefontdatabase_p.h> #endif #ifndef QT_NO_FREETYPE @@ -490,7 +491,7 @@ QWindowsStaticOpenGLContext *QWindowsIntegration::staticOpenGLContext() QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const { if (!d->m_fontDatabase) { -#ifdef QT_USE_DIRECTWRITE3 +#if QT_CONFIG(directwrite3) if (d->m_options & QWindowsIntegration::FontDatabaseDirectWrite) d->m_fontDatabase = new QWindowsDirectWriteFontDatabase; else |