1 files changed, 29 insertions, 24 deletions

diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
index bd193fbe78..56cf076bd9 100644
--- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
@@ -4,29 +4,25 @@
 ## FontDatabaseSupport Module:
 #####################################################################
 
-add_qt_module(FontDatabaseSupport
+qt_add_module(FontDatabaseSupport
     STATIC
     INTERNAL_MODULE
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
 
 #### Keys ignored in scope 1:.:.:fontdatabases.pro:<TRUE>:
 # MODULE = "fontdatabase_support"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(FontDatabaseSupport CONDITION APPLE
+qt_extend_target(FontDatabaseSupport CONDITION APPLE
     SOURCES
         mac/qcoretextfontdatabase.mm mac/qcoretextfontdatabase_p.h
         mac/qfontengine_coretext.mm mac/qfontengine_coretext_p.h
@@ -37,17 +33,17 @@ extend_target(FontDatabaseSupport CONDITION APPLE
         ${FWFoundation}
 )
 
-extend_target(FontDatabaseSupport CONDITION APPLE_OSX
+qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX
     LIBRARIES
         ${FWAppKit}
 )
 
-extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX
+qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX
     LIBRARIES
         ${FWUIKit}
 )
 
-extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype
     SOURCES
         freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h
         freetype/qfreetypefontdatabase.cpp freetype/qfreetypefontdatabase_p.h
@@ -55,12 +51,12 @@ extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype
         WrapFreetype::WrapFreetype
 )
 
-extend_target(FontDatabaseSupport CONDITION UNIX
+qt_extend_target(FontDatabaseSupport CONDITION UNIX
     SOURCES
         genericunix/qgenericunixfontdatabase_p.h
 )
 
-extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
     SOURCES
         fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
         fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h
@@ -68,64 +64,73 @@ extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX
         Fontconfig::Fontconfig
 )
 
-extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
+qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
     SOURCES
         windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h
+        windows/qwindowsfontdatabasebase.cpp windows/qwindowsfontdatabasebase_p.h
         windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
         windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
     LIBRARIES
-        Qt::GuiPrivate
         advapi32
         gdi32
         ole32
         user32
     PUBLIC_LIBRARIES
-        Qt::Gui
+        Qt::GuiPrivate
 )
 
-extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT
     SOURCES
         windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h
 )
 
-extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT
+qt_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_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsdirectwritefontdatabase.cpp windows/qwindowsdirectwritefontdatabase_p.h
+    DEFINES
+        QT_USE_DIRECTWRITE2
+        QT_USE_DIRECTWRITE3
+    LIBRARIES
+        dwrite_3
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
     DEFINES
         QT_USE_DIRECTWRITE2
     LIBRARIES
         dwrite_2
 )
 
-extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
     LIBRARIES
         dwrite
 )
 
-extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite)
+qt_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
+qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT
     LIBRARIES
         uuid
 )
 
-extend_target(FontDatabaseSupport CONDITION WINRT
+qt_extend_target(FontDatabaseSupport CONDITION WINRT
     SOURCES
         winrt/qwinrtfontdatabase.cpp winrt/qwinrtfontdatabase_p.h
     DEFINES
         __WRL_NO_DEFAULT_LIB__
     LIBRARIES
-        Qt::GuiPrivate
         dwrite_1
         ws2_32
     PUBLIC_LIBRARIES
-        Qt::Gui
+        Qt::GuiPrivate
 )