Regenerate src/*

Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

26 files changed, 100 insertions, 88 deletions

diff --git a/src/platformsupport/accessibility/CMakeLists.txt b/src/platformsupport/accessibility/CMakeLists.txt
index 43c8fa4487..35c1758b86 100644
--- a/src/platformsupport/accessibility/CMakeLists.txt
+++ b/src/platformsupport/accessibility/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## AccessibilitySupport Module:
 #####################################################################
 
-add_qt_module(AccessibilitySupport
+qt_add_module(AccessibilitySupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt
index 394bb07b3a..e6eb577973 100644
--- a/src/platformsupport/clipboard/CMakeLists.txt
+++ b/src/platformsupport/clipboard/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## ClipboardSupport Module:
 #####################################################################
 
-add_qt_module(ClipboardSupport
+qt_add_module(ClipboardSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
@@ -25,7 +25,7 @@ add_qt_module(ClipboardSupport
 ## Scopes:
 #####################################################################
 
-extend_target(ClipboardSupport CONDITION APPLE_OSX
+qt_extend_target(ClipboardSupport CONDITION APPLE_OSX
     LIBRARIES
         ${FWAppKit}
 )
diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt
index 92803c9eab..47ce31a66a 100644
--- a/src/platformsupport/devicediscovery/CMakeLists.txt
+++ b/src/platformsupport/devicediscovery/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## DeviceDiscoverySupport Module:
 #####################################################################
 
-add_qt_module(DeviceDiscoverySupport
+qt_add_module(DeviceDiscoverySupport
     STATIC
     INTERNAL_MODULE
     SOURCES
@@ -24,19 +24,19 @@ add_qt_module(DeviceDiscoverySupport
 ## Scopes:
 #####################################################################
 
-extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev
+qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev
     SOURCES
         qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h
     LIBRARIES
         PkgConfig::Libudev
 )
 
-extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
+qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
     SOURCES
         qdevicediscovery_static.cpp qdevicediscovery_static_p.h
 )
 
-extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
+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/edid/CMakeLists.txt b/src/platformsupport/edid/CMakeLists.txt
index bafba7d84b..e27aa34335 100644
--- a/src/platformsupport/edid/CMakeLists.txt
+++ b/src/platformsupport/edid/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## EdidSupport Module:
 #####################################################################
 
-add_qt_module(EdidSupport
+qt_add_module(EdidSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
index 5e4638b1ca..2d31b07cea 100644
--- a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## EglSupport Module:
 #####################################################################
 
-add_qt_module(EglSupport
+qt_add_module(EglSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
@@ -29,25 +29,25 @@ add_qt_module(EglSupport
 ## Scopes:
 #####################################################################
 
-extend_target(EglSupport CONDITION QT_FEATURE_opengl
+qt_extend_target(EglSupport CONDITION QT_FEATURE_opengl
     SOURCES
         qeglpbuffer.cpp qeglpbuffer_p.h
         qeglplatformcontext.cpp qeglplatformcontext_p.h
 )
 
-extend_target(EglSupport CONDITION QT_FEATURE_egl_x11
+qt_extend_target(EglSupport CONDITION QT_FEATURE_egl_x11
     SOURCES
         qxlibeglintegration.cpp qxlibeglintegration_p.h
     LIBRARIES
         X11::XCB
 )
 
-extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11
+qt_extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11
     DEFINES
         QT_EGL_NO_X11
 )
 
-extend_target(EglSupport CONDITION QT_FEATURE_dlopen
+qt_extend_target(EglSupport CONDITION QT_FEATURE_dlopen
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
 )
diff --git a/src/platformsupport/eglconvenience/CMakeLists.txt b/src/platformsupport/eglconvenience/CMakeLists.txt
index a0609c5a4d..0c56acd711 100644
--- a/src/platformsupport/eglconvenience/CMakeLists.txt
+++ b/src/platformsupport/eglconvenience/CMakeLists.txt
@@ -1,10 +1,12 @@
-qt_find_package(EGL) # special case
+# Generated from eglconvenience.pro.
 
 #####################################################################
 ## EglSupport Module:
 #####################################################################
 
-add_qt_module(EglSupport
+qt_find_package(EGL) # special case
+
+qt_add_module(EglSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
@@ -13,9 +15,7 @@ add_qt_module(EglSupport
         qt_egl_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-        QT_EGL_NO_X11
     LIBRARIES
-        ${CMAKE_DL_LIBS}
         Qt::CorePrivate
         Qt::GuiPrivate
         EGL::EGL # special case
@@ -32,13 +32,25 @@ add_qt_module(EglSupport
 ## Scopes:
 #####################################################################
 
-extend_target(EglSupport CONDITION QT_FEATURE_opengl
+qt_extend_target(EglSupport CONDITION QT_FEATURE_opengl
     SOURCES
         qeglpbuffer.cpp qeglpbuffer_p.h
         qeglplatformcontext.cpp qeglplatformcontext_p.h
 )
 
-extend_target(EglSupport CONDITION QT_FEATURE_xlib
+qt_extend_target(EglSupport CONDITION QT_FEATURE_egl_x11
     SOURCES
         qxlibeglintegration.cpp qxlibeglintegration_p.h
+    LIBRARIES
+        X11::XCB
+)
+
+qt_extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11
+    DEFINES
+        QT_EGL_NO_X11
+)
+
+qt_extend_target(EglSupport CONDITION QT_FEATURE_dlopen
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
 )
diff --git a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
index 229c1171ab..3a02b06bdd 100644
--- a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
+++ b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## EventDispatcherSupport Module:
 #####################################################################
 
-add_qt_module(EventDispatcherSupport
+qt_add_module(EventDispatcherSupport
     STATIC
     INTERNAL_MODULE
     DEFINES
@@ -25,19 +25,19 @@ add_qt_module(EventDispatcherSupport
 ## Scopes:
 #####################################################################
 
-extend_target(EventDispatcherSupport CONDITION UNIX
+qt_extend_target(EventDispatcherSupport CONDITION UNIX
     SOURCES
         qgenericunixeventdispatcher.cpp qgenericunixeventdispatcher_p.h
         qunixeventdispatcher.cpp
         qunixeventdispatcher_qpa_p.h
 )
 
-extend_target(EventDispatcherSupport CONDITION WIN32
+qt_extend_target(EventDispatcherSupport CONDITION WIN32
     SOURCES
         qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h
 )
 
-extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
+qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
     SOURCES
         qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
     LIBRARIES
diff --git a/src/platformsupport/eventdispatchers/CMakeLists.txt b/src/platformsupport/eventdispatchers/CMakeLists.txt
index add508b5b6..74ffbe5cbb 100644
--- a/src/platformsupport/eventdispatchers/CMakeLists.txt
+++ b/src/platformsupport/eventdispatchers/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(GLIB2) # special case
 ## EventDispatcherSupport Module:
 #####################################################################
 
-add_qt_module(EventDispatcherSupport
+qt_add_module(EventDispatcherSupport
     STATIC
     INTERNAL_MODULE
     DEFINES
@@ -27,19 +27,19 @@ add_qt_module(EventDispatcherSupport
 ## Scopes:
 #####################################################################
 
-extend_target(EventDispatcherSupport CONDITION UNIX
+qt_extend_target(EventDispatcherSupport CONDITION UNIX
     SOURCES
         qgenericunixeventdispatcher.cpp qgenericunixeventdispatcher_p.h
         qunixeventdispatcher.cpp
         qunixeventdispatcher_qpa_p.h
 )
 
-extend_target(EventDispatcherSupport CONDITION WIN32
+qt_extend_target(EventDispatcherSupport CONDITION WIN32
     SOURCES
         qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h
 )
 
-extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
+qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
     SOURCES
         qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
     LIBRARIES
diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt
index eb854114db..458c169e76 100644
--- a/src/platformsupport/fbconvenience/CMakeLists.txt
+++ b/src/platformsupport/fbconvenience/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## FbSupport Module:
 #####################################################################
 
-add_qt_module(FbSupport
+qt_add_module(FbSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
index 665d7b08e1..cdc85fc4c9 100644
--- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## FontDatabaseSupport Module:
 #####################################################################
 
-add_qt_module(FontDatabaseSupport
+qt_add_module(FontDatabaseSupport
     STATIC
     INTERNAL_MODULE
     DEFINES
@@ -25,7 +25,7 @@ add_qt_module(FontDatabaseSupport
 ## 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
@@ -36,17 +36,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
@@ -54,12 +54,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 AND UNIX
     SOURCES
         fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
         fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h
@@ -67,7 +67,7 @@ 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/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
@@ -82,41 +82,41 @@ extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
         Qt::Gui
 )
 
-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_directwrite2 AND WIN32 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 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
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
index 322a909f29..e17abc3f3a 100644
--- a/src/platformsupport/fontdatabases/CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -7,7 +7,7 @@ qt_find_package(Fontconfig) # special case
 ## FontDatabaseSupport Module:
 #####################################################################
 
-add_qt_module(FontDatabaseSupport
+qt_add_module(FontDatabaseSupport
     STATIC
     INTERNAL_MODULE
     DEFINES
@@ -28,7 +28,7 @@ add_qt_module(FontDatabaseSupport
 ## 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
@@ -39,17 +39,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
@@ -57,12 +57,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 AND UNIX
     SOURCES
         fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
         fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h
@@ -70,7 +70,7 @@ 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/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
@@ -85,41 +85,41 @@ extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
         Qt::Gui
 )
 
-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_directwrite2 AND WIN32 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 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
diff --git a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt
index 1df82148e8..4e5e7378d4 100644
--- a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## GlxSupport Module:
 #####################################################################
 
-add_qt_module(GlxSupport
+qt_add_module(GlxSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/glxconvenience/CMakeLists.txt b/src/platformsupport/glxconvenience/CMakeLists.txt
index 09ad8ed126..9d687f22a1 100644
--- a/src/platformsupport/glxconvenience/CMakeLists.txt
+++ b/src/platformsupport/glxconvenience/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(X11) # special case
 ## GlxSupport Module:
 #####################################################################
 
-add_qt_module(GlxSupport
+qt_add_module(GlxSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/graphics/CMakeLists.txt b/src/platformsupport/graphics/CMakeLists.txt
index 059b3346dd..cbb9e0937b 100644
--- a/src/platformsupport/graphics/CMakeLists.txt
+++ b/src/platformsupport/graphics/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## GraphicsSupport Module:
 #####################################################################
 
-add_qt_module(GraphicsSupport
+qt_add_module(GraphicsSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt
index 3c5cbaa4ce..d9fa7f80fd 100644
--- a/src/platformsupport/input/CMakeLists.txt
+++ b/src/platformsupport/input/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_find_package(Mtdev) # special case
 ## InputSupport Module:
 #####################################################################
 
-add_qt_module(InputSupport
+qt_add_module(InputSupport
     STATIC
     INTERNAL_MODULE
     DEFINES
@@ -33,7 +33,7 @@ add_qt_module(InputSupport
 ## Scopes:
 #####################################################################
 
-extend_target(InputSupport CONDITION QT_FEATURE_evdev
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
     SOURCES
         evdevkeyboard/qevdevkeyboard_defaultmap_p.h
         evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -46,35 +46,35 @@ extend_target(InputSupport CONDITION QT_FEATURE_evdev
         evdevtouch/../shared
 )
 
-extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
     SOURCES
         evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h
         evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h
 )
 
-extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
     LIBRARIES
         PkgConfig::Libudev
 )
 
-extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
     LIBRARIES
         PkgConfig::Libudev
 )
 
-extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
     LIBRARIES
         PkgConfig::Mtdev
 )
 
-extend_target(InputSupport CONDITION QT_FEATURE_tslib
+qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib
     SOURCES
         tslib/qtslib.cpp tslib/qtslib_p.h
     PUBLIC_LIBRARIES
         PkgConfig::Tslib
 )
 
-extend_target(InputSupport CONDITION QT_FEATURE_libinput
+qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
     SOURCES
         libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
         libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
@@ -87,7 +87,7 @@ extend_target(InputSupport CONDITION QT_FEATURE_libinput
         PkgConfig::Libudev
 )
 
-extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
+qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
     LIBRARIES
         Qt::XkbCommonSupportPrivate
         XKB::XKB
@@ -95,14 +95,14 @@ extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommo
         Qt::XkbCommonSupport
 )
 
-extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
     SOURCES
         shared/devicehandlerlist_p.h
         shared/qevdevutil.cpp shared/qevdevutil_p.h
         shared/qtouchoutputmapping.cpp shared/qtouchoutputmapping_p.h
 )
 
-extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
+qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
     SOURCES
         integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
     LIBRARIES
diff --git a/src/platformsupport/input/xkbcommon/CMakeLists.txt b/src/platformsupport/input/xkbcommon/CMakeLists.txt
index 74e43cd10e..18d07932d4 100644
--- a/src/platformsupport/input/xkbcommon/CMakeLists.txt
+++ b/src/platformsupport/input/xkbcommon/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## XkbCommonSupport Module:
 #####################################################################
 
-add_qt_module(XkbCommonSupport
+qt_add_module(XkbCommonSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
@@ -29,7 +29,7 @@ add_qt_module(XkbCommonSupport
 ## Scopes:
 #####################################################################
 
-extend_target(XkbCommonSupport CONDITION CLANG AND NOT ICC
+qt_extend_target(XkbCommonSupport CONDITION CLANG AND NOT ICC
     COMPILE_OPTIONS
         -ftemplate-depth=1024
 )
diff --git a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
index 0ed2ce57eb..500288db57 100644
--- a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## KmsSupport Module:
 #####################################################################
 
-add_qt_module(KmsSupport
+qt_add_module(KmsSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt
index 7eecd97f26..08e89f5f07 100644
--- a/src/platformsupport/kmsconvenience/CMakeLists.txt
+++ b/src/platformsupport/kmsconvenience/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(Libdrm) # special case
 ## KmsSupport Module:
 #####################################################################
 
-add_qt_module(KmsSupport
+qt_add_module(KmsSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
index cea4422465..6c9b8621ab 100644
--- a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
+++ b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## LinuxAccessibilitySupport Module:
 #####################################################################
 
-add_qt_module(LinuxAccessibilitySupport
+qt_add_module(LinuxAccessibilitySupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/linuxaccessibility/CMakeLists.txt b/src/platformsupport/linuxaccessibility/CMakeLists.txt
index 5676b28088..4ee93f4ca7 100644
--- a/src/platformsupport/linuxaccessibility/CMakeLists.txt
+++ b/src/platformsupport/linuxaccessibility/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(ATSPI2) # special case
 ## LinuxAccessibilitySupport Module:
 #####################################################################
 
-add_qt_module(LinuxAccessibilitySupport
+qt_add_module(LinuxAccessibilitySupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt
index ee8a47f084..b8b59a2723 100644
--- a/src/platformsupport/platformcompositor/CMakeLists.txt
+++ b/src/platformsupport/platformcompositor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## PlatformCompositorSupport Module:
 #####################################################################
 
-add_qt_module(PlatformCompositorSupport
+qt_add_module(PlatformCompositorSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/services/CMakeLists.txt b/src/platformsupport/services/CMakeLists.txt
index 30b2020caa..4744455489 100644
--- a/src/platformsupport/services/CMakeLists.txt
+++ b/src/platformsupport/services/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## ServiceSupport Module:
 #####################################################################
 
-add_qt_module(ServiceSupport
+qt_add_module(ServiceSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
@@ -27,7 +27,7 @@ add_qt_module(ServiceSupport
 ## Scopes:
 #####################################################################
 
-extend_target(ServiceSupport CONDITION QT_FEATURE_dbus
+qt_extend_target(ServiceSupport CONDITION QT_FEATURE_dbus
     PUBLIC_LIBRARIES
         Qt::DBus
 )
diff --git a/src/platformsupport/themes/CMakeLists.txt b/src/platformsupport/themes/CMakeLists.txt
index 6e13cae336..1c575a8bf1 100644
--- a/src/platformsupport/themes/CMakeLists.txt
+++ b/src/platformsupport/themes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## ThemeSupport Module:
 #####################################################################
 
-add_qt_module(ThemeSupport
+qt_add_module(ThemeSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
@@ -25,12 +25,12 @@ add_qt_module(ThemeSupport
 ## Scopes:
 #####################################################################
 
-extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT)
+qt_extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT)
     SOURCES
         genericunix/qgenericunixthemes.cpp genericunix/qgenericunixthemes_p.h
 )
 
-extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
+qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
     SOURCES
         genericunix/dbusmenu/qdbusmenuadaptor.cpp genericunix/dbusmenu/qdbusmenuadaptor_p.h
         genericunix/dbusmenu/qdbusmenubar.cpp genericunix/dbusmenu/qdbusmenubar_p.h
@@ -44,7 +44,7 @@ extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX
         Qt::DBus
 )
 
-extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
+qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
     SOURCES
         genericunix/dbustray/qdbustrayicon.cpp genericunix/dbustray/qdbustrayicon_p.h
         genericunix/dbustray/qdbustraytypes.cpp genericunix/dbustray/qdbustraytypes_p.h
diff --git a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
index bfec090512..070a0ee35f 100644
--- a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## VulkanSupport Module:
 #####################################################################
 
-add_qt_module(VulkanSupport
+qt_add_module(VulkanSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt
index 3d79bc5110..99435d1f55 100644
--- a/src/platformsupport/vkconvenience/CMakeLists.txt
+++ b/src/platformsupport/vkconvenience/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(Vulkan) # special case
 ## VulkanSupport Module:
 #####################################################################
 
-add_qt_module(VulkanSupport
+qt_add_module(VulkanSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/windowsuiautomation/CMakeLists.txt b/src/platformsupport/windowsuiautomation/CMakeLists.txt
index c9166d0b6c..f4c29b8c3e 100644
--- a/src/platformsupport/windowsuiautomation/CMakeLists.txt
+++ b/src/platformsupport/windowsuiautomation/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## WindowsUIAutomationSupport Module:
 #####################################################################
 
-add_qt_module(WindowsUIAutomationSupport
+qt_add_module(WindowsUIAutomationSupport
     STATIC
     INTERNAL_MODULE
     SOURCES