From 775e59564262b3f8c8b1f3f61a7c54e1d09d3bcd Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 6 May 2019 14:52:06 +0200
Subject: [PATCH] CMake: Regenerate platformsupport/fontdatabases

This one does actually contain functionality changes, but those look OK to me.

Change-Id: I5fd2caee16da86c529e1c83ca66452f780e54e26
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 .../fontdatabases/CMakeLists.txt              | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
index 7a0ef39b25..140882691c 100644
--- a/src/platformsupport/fontdatabases/CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Generated from fontdatabases.pro.
+
 qt_find_package(Freetype) # special case
 qt_find_package(Fontconfig) # special case
 
@@ -12,9 +14,12 @@ add_qt_module(FontDatabaseSupport
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
 )
 
-#### Keys ignored in scope 1:.:fontdatabases.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:fontdatabases.pro:<TRUE>:
 # CONFIG = "static" "internal_module"
 # MODULE = "fontdatabase_support"
 # PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h"
@@ -34,16 +39,6 @@ extend_target(FontDatabaseSupport CONDITION APPLE
         ${FWFoundation}
 )
 
-#### Keys ignored in scope 2:.:fontdatabases.pro:APPLE:
-# CONFIG = "watchos_coretext"
-
-extend_target(FontDatabaseSupport CONDITION APPLE AND QT_FEATURE_freetype
-    SOURCES
-        freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h
-    LIBRARIES
-        Freetype::Freetype
-)
-
 extend_target(FontDatabaseSupport CONDITION APPLE_OSX
     LIBRARIES
         ${FWAppKit}
@@ -82,6 +77,8 @@ extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
         windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
     LIBRARIES
         Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
         advapi32
         gdi32
         ole32
@@ -93,23 +90,32 @@ extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NO
         windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h
 )
 
-extend_target(FontDatabaseSupport CONDITION QT_FEATURE_directwrite AND WIN32 AND NOT WINRT
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT
     SOURCES
         windows/qwindowsfontenginedirectwrite.cpp windows/qwindowsfontenginedirectwrite_p.h
+    LIBRARIES
+        d2d1
 )
 
-extend_target(FontDatabaseSupport CONDITION QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT
     DEFINES
         QT_USE_DIRECTWRITE2
+    LIBRARIES
+        dwrite_2
 )
 
-extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT QT_FEATURE_directwrite AND NOT WINRT
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT
+    LIBRARIES
+        dwrite
+)
+
+extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite)
     DEFINES
         QT_NO_DIRECTWRITE
 )
 
 extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT
-    LIBRARIES
+    PUBLIC_LIBRARIES
         uuid
 )
 
@@ -120,6 +126,8 @@ extend_target(FontDatabaseSupport CONDITION WINRT
         __WRL_NO_DEFAULT_LIB__
     LIBRARIES
         Qt::GuiPrivate
-        dwrite
+        dwrite_1
+    PUBLIC_LIBRARIES
+        Qt::Gui
         ws2_32
 )