diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/text/unix/qgenericunixfontdatabase_p.h | 7 | ||||
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index b72e65dd28..a8e4d12718 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -748,7 +748,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype WrapFreetype::WrapFreetype ) -qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE +qt_internal_extend_target(Gui CONDITION UNIX AND NOT APPLE SOURCES text/unix/qgenericunixfontdatabase_p.h ) diff --git a/src/gui/text/unix/qgenericunixfontdatabase_p.h b/src/gui/text/unix/qgenericunixfontdatabase_p.h index 10d5c988fb..96124d025b 100644 --- a/src/gui/text/unix/qgenericunixfontdatabase_p.h +++ b/src/gui/text/unix/qgenericunixfontdatabase_p.h @@ -20,9 +20,12 @@ #if QT_CONFIG(fontconfig) #include <QtGui/private/qfontconfigdatabase_p.h> using QGenericUnixFontDatabase = QFontconfigDatabase; -#else +#elif QT_CONFIG(freetype) #include <QtGui/private/qfreetypefontdatabase_p.h> using QGenericUnixFontDatabase = QFreeTypeFontDatabase; -#endif //Q_FONTCONFIGDATABASE +#else +#include <qpa/qplatformfontdatabase.h> +using QGenericUnixFontDatabase = QPlatformFontDatabase; +#endif #endif // QGENERICUNIXFONTDATABASE_H diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 240d943f4d..4679967431 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -6,11 +6,11 @@ #include <QtGui/private/qpixmap_raster_p.h> #include <QtGui/private/qguiapplication_p.h> +#include <qpa/qplatformfontdatabase.h> #include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformwindow.h> #include <qpa/qwindowsysteminterface.h> -#include <QtGui/private/qfreetypefontdatabase_p.h> #if defined(Q_OS_WIN) # include <QtGui/private/qwindowsfontdatabase_p.h> # if QT_CONFIG(freetype) @@ -22,11 +22,11 @@ #if QT_CONFIG(fontconfig) # include <QtGui/private/qgenericunixfontdatabase_p.h> -# include <qpa/qplatformfontdatabase.h> #endif #if QT_CONFIG(freetype) #include <QtGui/private/qfontengine_ft_p.h> +#include <QtGui/private/qfreetypefontdatabase_p.h> #endif #if !defined(Q_OS_WIN) |