1 files changed, 61 insertions, 58 deletions
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
index 7033af1737..4a410e0c01 100644
--- a/src/platformsupport/fontdatabases/CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -1,30 +1,26 @@
 # Generated from fontdatabases.pro.
 
 #####################################################################
-## QtFontDatabaseSupport Module:
+## FontDatabaseSupport Module:
 #####################################################################
 
-find_package(Freetype)
-find_library(FWCoreGraphics CoreGraphics)
-find_library(FWCoreFoundation CoreFoundation)
-find_library(FWCoreText CoreText)
-find_library(FWFoundation Foundation)
-find_library(FWAppKit AppKit)
+find_package(Freetype) # Special case
 
 add_qt_module(FontDatabaseSupport
     STATIC
-    SOURCES fake.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
+    # CONFIG = "static" "internal_module"
+    # MODULE = "fontdatabase_support"
+    # PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h"
+    # _LOADED = "qt_module"
 )
-set_source_files_properties(fake.cpp PROPERTIES
-    SKIP_AUTOMOC ON
-    SKIP_AUTOUIC ON
-    SKIP_AUTORCC ON
-)
+
+## Scopes:
+#####################################################################
 
 extend_target(FontDatabaseSupport CONDITION APPLE
     SOURCES
@@ -35,7 +31,9 @@ extend_target(FontDatabaseSupport CONDITION APPLE
         ${FWCoreGraphics}
         ${FWCoreText}
         ${FWFoundation}
-        ${FWAppKit}
+        ${FWAppKit} # Special case
+
+    # CONFIG = "watchos_coretext"
 )
 
 extend_target(FontDatabaseSupport CONDITION APPLE AND QT_FEATURE_freetype
@@ -58,7 +56,7 @@ extend_target(FontDatabaseSupport CONDITION UNIX
         genericunix/qgenericunixfontdatabase_p.h
 )
 
-extend_target(FontDatabaseSupport CONDITION UNIX AND QT_FEATURE_fontconfig
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX
     SOURCES
         fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
         fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h
@@ -66,46 +64,51 @@ extend_target(FontDatabaseSupport CONDITION UNIX AND QT_FEATURE_fontconfig
         fontconfig
 )
 
-#extend_target(FontDatabaseSupport CONDITION WIN32
-#)
-
-#extend_target(FontDatabaseSupport CONDITION (WIN32) AND (NOT WINRT)
-#    SOURCES
-#        qwindowsfontdatabase.cpp qwindowsfontdatabase_p.h
-#        qwindowsfontengine.cpp qwindowsfontengine_p.h
-#        qwindowsnativeimage.cpp qwindowsnativeimage_p.h
-#    LIBRARIES
-#        Qt::GuiPrivate
-#)
-
-#extend_target(FontDatabaseSupport CONDITION ((WIN32) AND (NOT WINRT)) AND (QT_FEATURE_freetype)
-#    SOURCES
-#        qwindowsfontdatabase_ft.cpp qwindowsfontdatabase_ft_p.h
-#)
-
-#extend_target(FontDatabaseSupport CONDITION ((WIN32) AND (NOT WINRT)) AND (QT_FEATURE_directwrite)
-#    SOURCES
-#        qwindowsfontenginedirectwrite.cpp qwindowsfontenginedirectwrite_p.h
-#)
-
-#extend_target(FontDatabaseSupport CONDITION (((WIN32) AND (NOT WINRT)) AND (QT_FEATURE_directwrite)) AND (QT_FEATURE_directwrite2)
-#    DEFINES
-#        QT_USE_DIRECTWRITE2
-#)
-
-#extend_target(FontDatabaseSupport CONDITION ((WIN32) AND (NOT WINRT)) AND (NOT QT_FEATURE_directwrite)
-#    DEFINES
-#        QT_NO_DIRECTWRITE
-#)
-##
-##extend_target(FontDatabaseSupport CONDITION ((WIN32) AND (NOT WINRT)) AND (mingw)
-##)
-
-#extend_target(FontDatabaseSupport CONDITION WINRT
-#    SOURCES
-#        qwinrtfontdatabase.cpp qwinrtfontdatabase_p.h
-#    DEFINES
-#        __WRL_NO_DEFAULT_LIB__
-#    LIBRARIES
-#        Qt::GuiPrivate
-#)
+extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h
+        windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
+        windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
+    LIBRARIES
+        Qt::GuiPrivate
+        ole32
+        gdi32
+        user32
+        advapi32
+)
+
+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_directwrite AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontenginedirectwrite.cpp windows/qwindowsfontenginedirectwrite_p.h
+)
+
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT
+    DEFINES
+        QT_USE_DIRECTWRITE2
+)
+
+extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT QT_FEATURE_directwrite AND NOT WINRT
+    DEFINES
+        QT_NO_DIRECTWRITE
+)
+
+extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT
+    LIBRARIES
+        uuid
+)
+
+extend_target(FontDatabaseSupport CONDITION WINRT
+    SOURCES
+        winrt/qwinrtfontdatabase.cpp winrt/qwinrtfontdatabase_p.h
+    DEFINES
+        __WRL_NO_DEFAULT_LIB__
+    LIBRARIES
+        Qt::GuiPrivate
+        ws2_32
+        dwrite
+)