diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-12-08 11:29:17 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-12-10 11:44:39 +0100 |
| commit | a02750d12f84a5c7dcc72be6b71fac517b82ca09 (patch) | |
| tree | 85a6aae392c17c138a9471217edcbaa41e596476 /src/plugins/platforms/minimal | |
| parent | b9c80ecc08d98052e4757a916a8a55701be63497 (diff) | |
Isolate freetype feature
If freetype feature is not enabled we don't deliver its header
files as part of Qt. The freetype font database was used
as the generic fontdata base for unix platforms. This uses
QPlatformFontDatabase as the generic one if neither fontconfig
nor freetype features are enabled.
Fixes: QTBUG-109270
Change-Id: I9e935fd1557db417eb94d44b6a0d88818d567fbe
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/plugins/platforms/minimal')
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |