diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-28 08:20:55 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-11 19:38:09 +0200 |
| commit | b3e0732740d8fdace82d91973dac87261402604f (patch) | |
| tree | b5e4e607959c2db78d972a43bd3640d0f29c0942 /src/plugins/platforms/minimal | |
| parent | 84f279259713e60449ecf787babb6bdcadc16bea (diff) | |
Move windows font databases into QtGui
Requires adapting a few config checks since cmake currently
does not detect directwrite.
Task-number: QTBUG-83255
Task-number: QTBUG-83931
Change-Id: I521f1924f701260b41dccbcecf87b19f08df5ccc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/platforms/minimal')
| -rw-r--r-- | src/plugins/platforms/minimal/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/minimal/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/minimal/minimal.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index cdcdffa8e1..b5e165e2f1 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE +qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX AND NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate ) diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 72c1090771..958204bcd8 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -29,7 +29,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE +qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX AND NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate ) diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index a644e65026..4eebd0f6ad 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -3,7 +3,7 @@ TARGET = qminimal QT += \ core-private gui-private -!darwin: QT += fontdatabase_support-private +!darwin:!win32: QT += fontdatabase_support-private DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 16045d5e59..4a3b052200 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -47,9 +47,9 @@ #include <QtGui/private/qfreetypefontdatabase_p.h> #if defined(Q_OS_WIN) -# include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h> +# include <QtGui/private/qwindowsfontdatabase_p.h> # if QT_CONFIG(freetype) -# include <QtFontDatabaseSupport/private/qwindowsfontdatabase_ft_p.h> +# include <QtGui/private/qwindowsfontdatabase_ft_p.h> # endif #elif defined(Q_OS_DARWIN) # include <QtGui/private/qcoretextfontdatabase_p.h> |