From b3e0732740d8fdace82d91973dac87261402604f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 28 May 2020 08:20:55 +0200
Subject: 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>
---
 src/plugins/platforms/minimal/.prev_CMakeLists.txt    | 2 +-
 src/plugins/platforms/minimal/CMakeLists.txt          | 2 +-
 src/plugins/platforms/minimal/minimal.pro             | 2 +-
 src/plugins/platforms/minimal/qminimalintegration.cpp | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins/platforms/minimal')

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>
-- 
cgit v1.2.3