CMake: Regenerate projects to match updated plugin API

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

63 files changed, 100 insertions, 91 deletions

diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index d1464e2966..ed4b02c9fa 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -135,6 +135,7 @@ qt_add_module(Gui
         painting/qplatformbackingstore.cpp painting/qplatformbackingstore.h
         painting/qpolygon.cpp painting/qpolygon.h
         painting/qpolygonclipper_p.h
+        painting/qrangecollection.cpp painting/qrangecollection.h painting/qrangecollection_p.h
         painting/qrasterdefs_p.h
         painting/qrasterizer.cpp painting/qrasterizer_p.h
         painting/qrbtree_p.h
@@ -304,42 +305,45 @@ qt_extend_target(Gui CONDITION WIN32
 #### Keys ignored in scope 8:.:.:gui.pro:WIN32:
 # CMAKE_WINDOWS_BUILD = "True"
 
-#### Keys ignored in scope 11:.:.:gui.pro:QT_FEATURE_egl:
+#### Keys ignored in scope 10:.:.:gui.pro:NOT mingw OR QT_FEATURE_debug_and_release:
+# debug_suffix = "d"
+
+#### Keys ignored in scope 12:.:.:gui.pro:QT_FEATURE_egl:
 # CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)"
 
-#### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
+#### Keys ignored in scope 13:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
 # CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)"
 
-#### Keys ignored in scope 13:.:.:gui.pro:QT_FEATURE_opengles2:
+#### Keys ignored in scope 14:.:.:gui.pro:QT_FEATURE_opengles2:
 # CMAKE_GL_HEADER_NAME = "GLES2/gl2.h"
 # CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)"
 # CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)"
 # CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2"
 
-#### Keys ignored in scope 14:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
+#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
 # CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)"
 
-#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
+#### Keys ignored in scope 16:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
 # CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)"
 
-#### Keys ignored in scope 17:.:.:gui.pro:QT_FEATURE_opengl:
+#### Keys ignored in scope 18:.:.:gui.pro:QT_FEATURE_opengl:
 # CMAKE_GL_HEADER_NAME = "GL/gl.h"
 # CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)"
 # CMAKE_QT_OPENGL_IMPLEMENTATION = "GL"
 
-#### Keys ignored in scope 18:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
+#### Keys ignored in scope 19:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
 # CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)"
 
-#### Keys ignored in scope 19:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
+#### Keys ignored in scope 20:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
 # CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)"
 
-#### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
+#### Keys ignored in scope 21:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
 # CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)"
 
-#### Keys ignored in scope 21:.:.:gui.pro:APPLE:
+#### Keys ignored in scope 22:.:.:gui.pro:APPLE:
 # CMAKE_GL_HEADER_NAME = "gl.h"
 
-#### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl:
+#### Keys ignored in scope 23:.:.:gui.pro:QT_FEATURE_egl:
 # CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)"
 
 qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
@@ -398,7 +402,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png
         WrapPNG::WrapPNG
 )
 
-#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND mingw:
+#### Keys ignored in scope 39:.:image:image/image.pri:WIN32 AND mingw:
 # GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}"
 
 qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND mingw)) AND (GCC_VERSION___equals___8.1.0)
@@ -578,7 +582,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
         Vulkan::Vulkan_nolink
 )
 
-#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
 # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl"
 # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml"
 # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL"
@@ -594,10 +598,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 85:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 qt_extend_target(Gui CONDITION WASM
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 1d67aa5bc0..f12c9ff5c8 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -397,42 +397,45 @@ qt_extend_target(Gui CONDITION WIN32
 #### Keys ignored in scope 8:.:.:gui.pro:WIN32:
 # CMAKE_WINDOWS_BUILD = "True"
 
-#### Keys ignored in scope 11:.:.:gui.pro:QT_FEATURE_egl:
+#### Keys ignored in scope 10:.:.:gui.pro:NOT mingw OR QT_FEATURE_debug_and_release:
+# debug_suffix = "d"
+
+#### Keys ignored in scope 12:.:.:gui.pro:QT_FEATURE_egl:
 # CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)"
 
-#### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
+#### Keys ignored in scope 13:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
 # CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)"
 
-#### Keys ignored in scope 13:.:.:gui.pro:QT_FEATURE_opengles2:
+#### Keys ignored in scope 14:.:.:gui.pro:QT_FEATURE_opengles2:
 # CMAKE_GL_HEADER_NAME = "GLES2/gl2.h"
 # CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)"
 # CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)"
 # CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2"
 
-#### Keys ignored in scope 14:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
+#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
 # CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)"
 
-#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
+#### Keys ignored in scope 16:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
 # CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)"
 
-#### Keys ignored in scope 17:.:.:gui.pro:QT_FEATURE_opengl:
+#### Keys ignored in scope 18:.:.:gui.pro:QT_FEATURE_opengl:
 # CMAKE_GL_HEADER_NAME = "GL/gl.h"
 # CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)"
 # CMAKE_QT_OPENGL_IMPLEMENTATION = "GL"
 
-#### Keys ignored in scope 18:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
+#### Keys ignored in scope 19:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
 # CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)"
 
-#### Keys ignored in scope 19:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
+#### Keys ignored in scope 20:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
 # CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)"
 
-#### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
+#### Keys ignored in scope 21:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
 # CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)"
 
-#### Keys ignored in scope 21:.:.:gui.pro:APPLE:
+#### Keys ignored in scope 22:.:.:gui.pro:APPLE:
 # CMAKE_GL_HEADER_NAME = "gl.h"
 
-#### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl:
+#### Keys ignored in scope 23:.:.:gui.pro:QT_FEATURE_egl:
 # CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)"
 
 qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
@@ -491,7 +494,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png
         WrapPNG::WrapPNG
 )
 
-#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND mingw:
+#### Keys ignored in scope 39:.:image:image/image.pri:WIN32 AND mingw:
 # GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}"
 
 qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND mingw)) AND (GCC_VERSION___equals___8.1.0)
@@ -690,7 +693,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
         Vulkan::Vulkan_nolink
 )
 
-#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
 # special case begin
 # We must always generate syncqt-injected header files,
 # because we added a custom command earlier for those for framework builds.
@@ -746,10 +748,10 @@ add_custom_command(
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 85:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 qt_extend_target(Gui CONDITION WASM
diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
index 86f5c36124..81508badf0 100644
--- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt
+++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QEvdevKeyboardPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEvdevKeyboardPlugin
+qt_internal_add_plugin(QEvdevKeyboardPlugin
     OUTPUT_NAME qevdevkeyboardplugin
     TYPE generic
     SOURCES
diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt
index 2ed6c1b6d4..9241155f9b 100644
--- a/src/plugins/generic/evdevmouse/CMakeLists.txt
+++ b/src/plugins/generic/evdevmouse/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QEvdevMousePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEvdevMousePlugin
+qt_internal_add_plugin(QEvdevMousePlugin
     OUTPUT_NAME qevdevmouseplugin
     TYPE generic
     SOURCES
diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt
index 93dd10a0e1..61e26a0587 100644
--- a/src/plugins/generic/evdevtablet/CMakeLists.txt
+++ b/src/plugins/generic/evdevtablet/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QEvdevTabletPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEvdevTabletPlugin
+qt_internal_add_plugin(QEvdevTabletPlugin
     OUTPUT_NAME qevdevtabletplugin
     TYPE generic
     SOURCES
diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt
index e4a4d40c2a..fbdff8d7a6 100644
--- a/src/plugins/generic/evdevtouch/CMakeLists.txt
+++ b/src/plugins/generic/evdevtouch/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QEvdevTouchScreenPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEvdevTouchScreenPlugin
+qt_internal_add_plugin(QEvdevTouchScreenPlugin
     OUTPUT_NAME qevdevtouchplugin
     TYPE generic
     SOURCES
diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt
index b772623307..d7c434391e 100644
--- a/src/plugins/generic/libinput/CMakeLists.txt
+++ b/src/plugins/generic/libinput/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QLibInputPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QLibInputPlugin
+qt_internal_add_plugin(QLibInputPlugin
     OUTPUT_NAME qlibinputplugin
     TYPE generic
     SOURCES
diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt
index 3e82a077c3..ce1c6b952f 100644
--- a/src/plugins/generic/tslib/.prev_CMakeLists.txt
+++ b/src/plugins/generic/tslib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QTsLibPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QTsLibPlugin
+qt_internal_add_plugin(QTsLibPlugin
     OUTPUT_NAME qtslibplugin
     TYPE generic
     SOURCES
diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt
index 964e322a55..7d234a2456 100644
--- a/src/plugins/generic/tslib/CMakeLists.txt
+++ b/src/plugins/generic/tslib/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(Tslib) # special case
 ## QTsLibPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QTsLibPlugin
+qt_internal_add_plugin(QTsLibPlugin
     OUTPUT_NAME qtslibplugin
     TYPE generic
     SOURCES
diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt
index 82db49d4c3..57c77ff000 100644
--- a/src/plugins/generic/tuiotouch/CMakeLists.txt
+++ b/src/plugins/generic/tuiotouch/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QTuioTouchPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QTuioTouchPlugin
+qt_internal_add_plugin(QTuioTouchPlugin
     OUTPUT_NAME qtuiotouchplugin
     TYPE generic
     SOURCES
diff --git a/src/plugins/imageformats/gif/.prev_CMakeLists.txt b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
index b4923b81b1..c071c1d785 100644
--- a/src/plugins/imageformats/gif/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QGifPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QGifPlugin
+qt_internal_add_plugin(QGifPlugin
     OUTPUT_NAME qgif
     TYPE imageformats
     SOURCES
diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt
index c6780e32e9..9a9150bccc 100644
--- a/src/plugins/imageformats/gif/CMakeLists.txt
+++ b/src/plugins/imageformats/gif/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QGifPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QGifPlugin
+qt_internal_add_plugin(QGifPlugin
     OUTPUT_NAME qgif
     TYPE imageformats
     SOURCES
diff --git a/src/plugins/imageformats/ico/.prev_CMakeLists.txt b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
index 6151d6fd07..53332f8c35 100644
--- a/src/plugins/imageformats/ico/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
@@ -4,16 +4,15 @@
 ## QICOPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QICOPlugin
+add_qt_plugin(QICOPlugin
     OUTPUT_NAME qico
     TYPE imageformats
     SOURCES
         main.cpp main.h
         qicohandler.cpp qicohandler.h
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
 )
 
diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt
index 1174848d5e..c5362df3e9 100644
--- a/src/plugins/imageformats/ico/CMakeLists.txt
+++ b/src/plugins/imageformats/ico/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QICOPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QICOPlugin
+qt_internal_add_plugin(QICOPlugin
     OUTPUT_NAME qico
     TYPE imageformats
     SOURCES
diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
index a02c8f05ed..bf9b12e703 100644
--- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QJpegPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QJpegPlugin
+qt_internal_add_plugin(QJpegPlugin
     OUTPUT_NAME qjpeg
     TYPE imageformats
     SOURCES
diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt
index 13d28c7b8b..2542a86eed 100644
--- a/src/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(JPEG) # special case
 ## QJpegPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QJpegPlugin
+qt_internal_add_plugin(QJpegPlugin
     OUTPUT_NAME qjpeg
     TYPE imageformats
     SOURCES
diff --git a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt
index ff09314303..e4a4856bf5 100644
--- a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt
+++ b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QComposePlatformInputContextPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QComposePlatformInputContextPlugin
+qt_internal_add_plugin(QComposePlatformInputContextPlugin
     OUTPUT_NAME composeplatforminputcontextplugin
     TYPE platforminputcontexts
     SOURCES
diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt
index fe4e3b8b80..90a149f7ac 100644
--- a/src/plugins/platforminputcontexts/compose/CMakeLists.txt
+++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt
@@ -6,7 +6,8 @@
 
 qt_find_package(XKB) # special case
 pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case
-qt_add_plugin(QComposePlatformInputContextPlugin
+
+qt_internal_add_plugin(QComposePlatformInputContextPlugin
     OUTPUT_NAME composeplatforminputcontextplugin
     TYPE platforminputcontexts
     SOURCES
diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
index 1017407342..ed75d7062a 100644
--- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
+++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QIbusPlatformInputContextPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QIbusPlatformInputContextPlugin
+qt_internal_add_plugin(QIbusPlatformInputContextPlugin
     OUTPUT_NAME ibusplatforminputcontextplugin
     TYPE platforminputcontexts
     SOURCES
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt
index 7b21613fb9..4f066771d8 100644
--- a/src/plugins/platforms/android/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/android/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QAndroidIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QAndroidIntegrationPlugin
+qt_internal_add_plugin(QAndroidIntegrationPlugin
     OUTPUT_NAME qtforandroid
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt
index 4d1f83053b..6333e51e03 100644
--- a/src/plugins/platforms/android/CMakeLists.txt
+++ b/src/plugins/platforms/android/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QAndroidIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QAndroidIntegrationPlugin
+qt_internal_add_plugin(QAndroidIntegrationPlugin
     OUTPUT_NAME qtforandroid
     TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
index 4963891fc0..bb7e34c285 100644
--- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QCocoaIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QCocoaIntegrationPlugin
+qt_internal_add_plugin(QCocoaIntegrationPlugin
     OUTPUT_NAME qcocoa
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index 4ed23c4367..9151ad4d3f 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -7,7 +7,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups)
 ## QCocoaIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QCocoaIntegrationPlugin
+qt_internal_add_plugin(QCocoaIntegrationPlugin
     OUTPUT_NAME qcocoa
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case
     TYPE platforms
diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
index 33beaa3da4..3f5c8a6d60 100644
--- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QDirectFbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QDirectFbIntegrationPlugin
+qt_internal_add_plugin(QDirectFbIntegrationPlugin
     OUTPUT_NAME qdirectfb
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt
index c723ca75f4..3a570feb00 100644
--- a/src/plugins/platforms/directfb/CMakeLists.txt
+++ b/src/plugins/platforms/directfb/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_find_package(DirectFB)
 ## QDirectFbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QDirectFbIntegrationPlugin
+qt_internal_add_plugin(QDirectFbIntegrationPlugin
     OUTPUT_NAME qdirectfb
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
index a62b8bbb2b..1f75e1717a 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QEglFSEmulatorIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEglFSEmulatorIntegrationPlugin
+qt_internal_add_plugin(QEglFSEmulatorIntegrationPlugin
     OUTPUT_NAME qeglfs-emu-integration
     TYPE egldeviceintegrations
     SOURCES
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
index 55a1d71c07..7e9304f62f 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QEglFSKmsGbmIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEglFSKmsGbmIntegrationPlugin
+qt_internal_add_plugin(QEglFSKmsGbmIntegrationPlugin
     OUTPUT_NAME qeglfs-kms-integration
     TYPE egldeviceintegrations
     SOURCES
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
index a0b405c90c..b3e3018366 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QEglFSKmsEglDeviceIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
+qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
     OUTPUT_NAME qeglfs-kms-egldevice-integration
     TYPE egldeviceintegrations
     SOURCES
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
index fee448db8a..8f94ad1fa0 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QEglFSX11IntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEglFSX11IntegrationPlugin
+qt_internal_add_plugin(QEglFSX11IntegrationPlugin
     OUTPUT_NAME qeglfs-x11-integration
     TYPE egldeviceintegrations
     SOURCES
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
index 0fbb0fdbd8..526a053b02 100644
--- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QIosOptionalPlugin_NSPhotoLibrary Plugin:
 #####################################################################
 
-add_qt_plugin(QIosOptionalPlugin_NSPhotoLibrary
+qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
     OUTPUT_NAME qiosnsphotolibrarysupport
     TYPE platforms/darwin
     SOURCES
diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
index bcec98e1de..63212e4998 100644
--- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QLinuxFbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QLinuxFbIntegrationPlugin
+qt_internal_add_plugin(QLinuxFbIntegrationPlugin
     OUTPUT_NAME qlinuxfb
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt
index 8747894100..826f3286fe 100644
--- a/src/plugins/platforms/linuxfb/CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QLinuxFbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QLinuxFbIntegrationPlugin
+qt_internal_add_plugin(QLinuxFbIntegrationPlugin
     OUTPUT_NAME qlinuxfb
     TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case
diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
index 764c684932..e33bbc6815 100644
--- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QMinimalIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QMinimalIntegrationPlugin
+qt_internal_add_plugin(QMinimalIntegrationPlugin
     OUTPUT_NAME qminimal
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt
index 623cf5f83a..b2ce151b55 100644
--- a/src/plugins/platforms/minimal/CMakeLists.txt
+++ b/src/plugins/platforms/minimal/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype) # special case
 
-qt_add_plugin(QMinimalIntegrationPlugin
+qt_internal_add_plugin(QMinimalIntegrationPlugin
     OUTPUT_NAME qminimal
     TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case
diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
index 7a08af79a9..429d179bbc 100644
--- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QMinimalEglIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QMinimalEglIntegrationPlugin
+qt_internal_add_plugin(QMinimalEglIntegrationPlugin
     OUTPUT_NAME qminimalegl
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt
index 4c8856e35d..3ea10d6fe8 100644
--- a/src/plugins/platforms/minimalegl/CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QMinimalEglIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QMinimalEglIntegrationPlugin
+qt_internal_add_plugin(QMinimalEglIntegrationPlugin
     OUTPUT_NAME qminimalegl
     TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
index 62d36ec449..45e10e6239 100644
--- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QOffscreenIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QOffscreenIntegrationPlugin
+qt_internal_add_plugin(QOffscreenIntegrationPlugin
     OUTPUT_NAME qoffscreen
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt
index 63474c3760..7387e083b6 100644
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QOffscreenIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QOffscreenIntegrationPlugin
+qt_internal_add_plugin(QOffscreenIntegrationPlugin
     OUTPUT_NAME qoffscreen
     TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case
diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
index a26cc0be2b..092ab79d5c 100644
--- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QVncIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QVncIntegrationPlugin
+qt_internal_add_plugin(QVncIntegrationPlugin
     OUTPUT_NAME qvnc
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt
index cb84355d81..b6ac43794a 100644
--- a/src/plugins/platforms/vnc/CMakeLists.txt
+++ b/src/plugins/platforms/vnc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QVncIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QVncIntegrationPlugin
+qt_internal_add_plugin(QVncIntegrationPlugin
     OUTPUT_NAME qvnc
     TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt
index 92b2ccb217..29bd26a67e 100644
--- a/src/plugins/platforms/windows/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QWindowsIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QWindowsIntegrationPlugin
+qt_internal_add_plugin(QWindowsIntegrationPlugin
     OUTPUT_NAME qwindows
     TYPE platforms
     SOURCES
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
index 4cb9608378..b8655ac69d 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QWindowsIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QWindowsIntegrationPlugin
+qt_internal_add_plugin(QWindowsIntegrationPlugin
     OUTPUT_NAME qwindows
     TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
index a78d01ec87..bfe5f25eaf 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QXcbEglIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QXcbEglIntegrationPlugin
+qt_internal_add_plugin(QXcbEglIntegrationPlugin
     OUTPUT_NAME qxcb-egl-integration
     TYPE xcbglintegrations
     SOURCES
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
index b3361dbd99..b8ed160b09 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QXcbGlxIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QXcbGlxIntegrationPlugin
+qt_internal_add_plugin(QXcbGlxIntegrationPlugin
     OUTPUT_NAME qxcb-glx-integration
     TYPE xcbglintegrations
     SOURCES
diff --git a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt
index 0784de2ca8..41f7c79a15 100644
--- a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt
+++ b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QGtk3ThemePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QGtk3ThemePlugin
+qt_internal_add_plugin(QGtk3ThemePlugin
     OUTPUT_NAME qgtk3
     TYPE platformthemes
     SOURCES
diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt
index 4e56e4a6b3..fca48c5fc9 100644
--- a/src/plugins/platformthemes/gtk3/CMakeLists.txt
+++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt
@@ -7,7 +7,7 @@ qt_find_package(X11) # special case
 ## QGtk3ThemePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QGtk3ThemePlugin
+qt_internal_add_plugin(QGtk3ThemePlugin
     OUTPUT_NAME qgtk3
     TYPE platformthemes
     SOURCES
diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
index a9062f695f..984759f901 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
+++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QXdgDesktopPortalThemePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QXdgDesktopPortalThemePlugin
+qt_internal_add_plugin(QXdgDesktopPortalThemePlugin
     OUTPUT_NAME qxdgdesktopportal
     TYPE platformthemes
     SOURCES
diff --git a/src/plugins/printsupport/cocoa/CMakeLists.txt b/src/plugins/printsupport/cocoa/CMakeLists.txt
index 72660dc173..3b3f3023a1 100644
--- a/src/plugins/printsupport/cocoa/CMakeLists.txt
+++ b/src/plugins/printsupport/cocoa/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QCocoaPrinterSupportPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QCocoaPrinterSupportPlugin
+qt_internal_add_plugin(QCocoaPrinterSupportPlugin
     OUTPUT_NAME cocoaprintersupport
     TYPE printsupport
     SOURCES
diff --git a/src/plugins/printsupport/cups/.prev_CMakeLists.txt b/src/plugins/printsupport/cups/.prev_CMakeLists.txt
index c65ffb89c7..8d374b0468 100644
--- a/src/plugins/printsupport/cups/.prev_CMakeLists.txt
+++ b/src/plugins/printsupport/cups/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QCupsPrinterSupportPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QCupsPrinterSupportPlugin
+qt_internal_add_plugin(QCupsPrinterSupportPlugin
     OUTPUT_NAME cupsprintersupport
     TYPE printsupport
     SOURCES
diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt
index 5c920443ea..9adc0d2fa6 100644
--- a/src/plugins/printsupport/cups/CMakeLists.txt
+++ b/src/plugins/printsupport/cups/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case
 ## QCupsPrinterSupportPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QCupsPrinterSupportPlugin
+qt_internal_add_plugin(QCupsPrinterSupportPlugin
     OUTPUT_NAME cupsprintersupport
     TYPE printsupport
     SOURCES
diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt
index 637461e168..cebd216592 100644
--- a/src/plugins/sqldrivers/db2/CMakeLists.txt
+++ b/src/plugins/sqldrivers/db2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QDB2DriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QDB2DriverPlugin
+qt_internal_add_plugin(QDB2DriverPlugin
     OUTPUT_NAME qsqldb2
     TYPE sqldrivers
     SOURCES
diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt
index c99f322dfb..18409748df 100644
--- a/src/plugins/sqldrivers/mysql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QMYSQLDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QMYSQLDriverPlugin
+qt_internal_add_plugin(QMYSQLDriverPlugin
     OUTPUT_NAME qsqlmysql
     TYPE sqldrivers
     SOURCES
diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt
index 713c9fc871..93af813691 100644
--- a/src/plugins/sqldrivers/oci/CMakeLists.txt
+++ b/src/plugins/sqldrivers/oci/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QOCIDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QOCIDriverPlugin
+qt_internal_add_plugin(QOCIDriverPlugin
     OUTPUT_NAME qsqloci
     TYPE sqldrivers
     SOURCES
diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
index 692d1fc294..5c71b578c0 100644
--- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QODBCDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QODBCDriverPlugin
+qt_internal_add_plugin(QODBCDriverPlugin
     OUTPUT_NAME qsqlodbc
     TYPE sqldrivers
     SOURCES
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
index 5c163181c5..ab8f1eb2b6 100644
--- a/src/plugins/sqldrivers/odbc/CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -5,7 +5,8 @@
 #####################################################################
 
 qt_find_package(ODBC) # special case
-qt_add_plugin(QODBCDriverPlugin
+
+qt_internal_add_plugin(QODBCDriverPlugin
     OUTPUT_NAME qsqlodbc
     TYPE sqldrivers
     SOURCES
diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
index f3cec6d302..569f34471d 100644
--- a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QPSQLDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QPSQLDriverPlugin
+qt_internal_add_plugin(QPSQLDriverPlugin
     OUTPUT_NAME qsqlpsql
     TYPE sqldrivers
     SOURCES
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
index 03a2dc69c3..62e9619d16 100644
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_find_package(PostgreSQL) # special case
 ## QPSQLDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QPSQLDriverPlugin
+qt_internal_add_plugin(QPSQLDriverPlugin
     OUTPUT_NAME qsqlpsql
     TYPE sqldrivers
     SOURCES
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
index 3f3c1fabbf..6413515efe 100644
--- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QSQLiteDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QSQLiteDriverPlugin
+qt_internal_add_plugin(QSQLiteDriverPlugin
     OUTPUT_NAME qsqlite
     TYPE sqldrivers
     SOURCES
diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
index e2e711bd78..8f1faeef9e 100644
--- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QSQLiteDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QSQLiteDriverPlugin
+qt_internal_add_plugin(QSQLiteDriverPlugin
     OUTPUT_NAME qsqlite
     TYPE sqldrivers
     SOURCES
diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt
index 140d4e4c93..4c4e488d91 100644
--- a/src/plugins/styles/mac/CMakeLists.txt
+++ b/src/plugins/styles/mac/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QMacStylePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QMacStylePlugin
+qt_internal_add_plugin(QMacStylePlugin
     OUTPUT_NAME qmacstyle
     TYPE styles
     SOURCES
diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt
index 008fa624fe..224b7f1da1 100644
--- a/src/plugins/styles/windowsvista/CMakeLists.txt
+++ b/src/plugins/styles/windowsvista/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QWindowsVistaStylePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QWindowsVistaStylePlugin
+qt_internal_add_plugin(QWindowsVistaStylePlugin
     OUTPUT_NAME qwindowsvistastyle
     TYPE styles
     SOURCES
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index 47e4877e20..90932f7265 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -152,6 +152,7 @@ qt_add_module(Bootstrap
         QT_VERSION_STR=\"\"
     INCLUDE_DIRECTORIES
         ..
+        ../../3rdparty/pcre2/src
         ../../3rdparty/tinycbor/src
     PUBLIC_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/pcre2/src>
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index ccac76d184..65fb73da97 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -147,6 +147,7 @@ qt_extend_target(Bootstrap
         QT_NO_FOREACH
     INCLUDE_DIRECTORIES
         ..
+        ../../3rdparty/pcre2/src
         ../../3rdparty/tinycbor/src
     PUBLIC_INCLUDE_DIRECTORIES  # special case
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/pcre2/src>