CMake: Regenerate src/platformsupport

Change-Id: If7b5359c457edee814dc7d3a71cf47ce052e6c5e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 58 insertions, 52 deletions

diff --git a/src/platformsupport/.prev_CMakeLists.txt b/src/platformsupport/.prev_CMakeLists.txt
index 9d237c65ed..e24ef6d9bf 100644
--- a/src/platformsupport/.prev_CMakeLists.txt
+++ b/src/platformsupport/.prev_CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(devicediscovery)
 add_subdirectory(fbconvenience)
 add_subdirectory(themes)
 add_subdirectory(linuxofono)
-if(APPLE OR QT_FEATURE_freetype OR WIN32)
+if(WIN32 OR (QT_FEATURE_freetype AND NOT APPLE))
     add_subdirectory(fontdatabases)
 endif()
 if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon)
@@ -15,9 +15,6 @@ endif()
 if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
     add_subdirectory(services)
 endif()
-if(QT_FEATURE_opengl)
-    add_subdirectory(platformcompositor)
-endif()
 if(QT_FEATURE_egl)
     add_subdirectory(eglconvenience)
 endif()
@@ -33,13 +30,3 @@ endif()
 if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge)
     add_subdirectory(linuxaccessibility)
 endif()
-if(QT_FEATURE_accessibility AND WIN32 AND NOT WINRT)
-    add_subdirectory(windowsuiautomation)
-endif()
-if(APPLE)
-    add_subdirectory(clipboard)
-    add_subdirectory(graphics)
-endif()
-if(QT_FEATURE_vulkan)
-    add_subdirectory(vkconvenience)
-endif()
diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index ae75c87c97..b18b27f5fb 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -10,7 +10,7 @@ if (QT_FEATURE_dbus)
     add_subdirectory(linuxofono)
 endif()
 # special case end
-if(APPLE OR QT_FEATURE_freetype OR WIN32)
+if(WIN32 OR (QT_FEATURE_freetype AND NOT APPLE))
     add_subdirectory(fontdatabases)
 endif()
 if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon)
diff --git a/src/platformsupport/devicediscovery/.prev_CMakeLists.txt b/src/platformsupport/devicediscovery/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8ecabb4a1b
--- /dev/null
+++ b/src/platformsupport/devicediscovery/.prev_CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from devicediscovery.pro.
+
+#####################################################################
+## DeviceDiscoverySupport Module:
+#####################################################################
+
+qt_add_module(DeviceDiscoverySupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qdevicediscovery_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:devicediscovery.pro:<TRUE>:
+# MODULE = "devicediscovery_support"
+# QT_FOR_CONFIG = "gui-private"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev
+    SOURCES
+        qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h
+    LIBRARIES
+        PkgConfig::Libudev
+)
+
+qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
+    SOURCES
+        qdevicediscovery_static.cpp qdevicediscovery_static_p.h
+)
+
+qt_extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
+    SOURCES
+        qdevicediscovery_dummy.cpp qdevicediscovery_dummy_p.h
+)
diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
index b30b04824a..5ac6c097a0 100644
--- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
@@ -22,35 +22,6 @@ qt_add_module(FontDatabaseSupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(FontDatabaseSupport CONDITION APPLE
-    SOURCES
-        mac/qcoretextfontdatabase.mm mac/qcoretextfontdatabase_p.h
-        mac/qfontengine_coretext.mm mac/qfontengine_coretext_p.h
-    LIBRARIES
-        ${FWCoreFoundation}
-        ${FWCoreGraphics}
-        ${FWCoreText}
-        ${FWFoundation}
-)
-
-qt_extend_target(FontDatabaseSupport CONDITION MACOS
-    LIBRARIES
-        ${FWAppKit}
-)
-
-qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT MACOS
-    LIBRARIES
-        ${FWUIKit}
-)
-
-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
-    LIBRARIES
-        WrapFreetype::WrapFreetype
-)
-
 qt_extend_target(FontDatabaseSupport CONDITION UNIX
     SOURCES
         genericunix/qgenericunixfontdatabase_p.h
@@ -82,6 +53,8 @@ qt_extend_target(FontDatabaseSupport CONDITION 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
+    LIBRARIES
+        WrapFreetype::WrapFreetype
 )
 
 qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT
@@ -118,7 +91,7 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_F
         QT_NO_DIRECTWRITE
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT
+qt_extend_target(FontDatabaseSupport CONDITION MINGW AND WIN32 AND NOT WINRT
     LIBRARIES
         uuid
 )
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
index 913e9ba14e..32efd33a5f 100644
--- a/src/platformsupport/fontdatabases/CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -25,11 +25,6 @@ qt_add_module(FontDatabaseSupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype
-    LIBRARIES
-        WrapFreetype::WrapFreetype
-)
-
 qt_extend_target(FontDatabaseSupport CONDITION UNIX
     SOURCES
         genericunix/qgenericunixfontdatabase_p.h
@@ -43,6 +38,15 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
         Fontconfig::Fontconfig
 )
 
+# special case begin
+if(TARGET WrapFreetype::WrapFreetype)
+   qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
+       LIBRARIES
+           WrapFreetype::WrapFreetype
+)
+endif()
+# special case end
+
 qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
     SOURCES
         windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h
@@ -61,6 +65,8 @@ qt_extend_target(FontDatabaseSupport CONDITION 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
+    LIBRARIES
+        WrapFreetype::WrapFreetype
 )
 
 qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT
@@ -97,7 +103,7 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_F
         QT_NO_DIRECTWRITE
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT
+qt_extend_target(FontDatabaseSupport CONDITION MINGW AND WIN32 AND NOT WINRT
     LIBRARIES
         uuid
 )
diff --git a/src/platformsupport/linuxofono/CMakeLists.txt b/src/platformsupport/linuxofono/CMakeLists.txt
index ba8bc97dd6..8eadff551d 100644
--- a/src/platformsupport/linuxofono/CMakeLists.txt
+++ b/src/platformsupport/linuxofono/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## LinuxOfonoSupport Module:
 #####################################################################
 
-add_qt_module(LinuxOfonoSupport
+qt_add_module(LinuxOfonoSupport
     STATIC
     INTERNAL_MODULE
     SOURCES