CMake: Regenerate projects to use new qt_internal_ API

Modify special case locations to use the new API as well.
Clean up some stale .prev files that are not needed anymore.
Clean up some project files that are not used anymore.

Task-number: QTBUG-86815
Change-Id: I9947da921f98686023c6bb053dfcc101851276b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1165 files changed, 2440 insertions, 2751 deletions

diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt
index aa265d4308..74a2750ff2 100644
--- a/qmake/.prev_CMakeLists.txt
+++ b/qmake/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qmake)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     SOURCES
         ../src/3rdparty/pcre2/src/config.h
         ../src/3rdparty/pcre2/src/pcre2.h
@@ -172,7 +172,7 @@ qt_add_tool(${target_name}
 ## Scopes:
 #####################################################################
 
-qt_extend_target(${target_name} CONDITION WIN32
+qt_internal_extend_target(${target_name} CONDITION WIN32
     SOURCES
         ../src/corelib/global/qoperatingsystemversion_win.cpp
         ../src/corelib/io/qfilesystemengine_win.cpp
@@ -196,7 +196,7 @@ qt_extend_target(${target_name} CONDITION WIN32
         ole32
 )
 
-qt_extend_target(${target_name} CONDITION UNIX
+qt_internal_extend_target(${target_name} CONDITION UNIX
     SOURCES
         ../src/corelib/io/qfilesystemengine_unix.cpp
         ../src/corelib/io/qfilesystemiterator_unix.cpp
@@ -205,7 +205,7 @@ qt_extend_target(${target_name} CONDITION UNIX
         ../src/corelib/text/qlocale_unix.cpp
 )
 
-qt_extend_target(${target_name} CONDITION MACOS
+qt_internal_extend_target(${target_name} CONDITION MACOS
     SOURCES
         qcore_foundation.mm
         qcore_mac.mm
@@ -219,12 +219,12 @@ qt_extend_target(${target_name} CONDITION MACOS
         -fconstant-cfstrings
 )
 
-qt_extend_target(${target_name} CONDITION MINGW AND WIN32
+qt_internal_extend_target(${target_name} CONDITION MINGW AND WIN32
     PUBLIC_LIBRARIES
         uuid
 )
 
-qt_extend_target(${target_name} CONDITION CLANG AND WIN32
+qt_internal_extend_target(${target_name} CONDITION CLANG AND WIN32
     COMPILE_OPTIONS
         -Wno-microsoft-enum-value
         -fms-compatibility-version=19.00.23506
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index 2f3eb78b79..65d847375e 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qmake)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     NO_QT # special case
     TOOLS_TARGET Core # special case
     # GUI # special case: remove this
@@ -191,7 +191,7 @@ qt_add_tool(${target_name}
 ## Scopes:
 #####################################################################
 
-qt_extend_target(${target_name} CONDITION WIN32
+qt_internal_extend_target(${target_name} CONDITION WIN32
     SOURCES
         ../src/corelib/global/qoperatingsystemversion_win.cpp
         ../src/corelib/io/qfilesystemengine_win.cpp
@@ -215,7 +215,7 @@ qt_extend_target(${target_name} CONDITION WIN32
         ole32
 )
 
-qt_extend_target(${target_name} CONDITION UNIX
+qt_internal_extend_target(${target_name} CONDITION UNIX
     SOURCES
         ../src/corelib/io/qfilesystemengine_unix.cpp
         ../src/corelib/io/qfilesystemiterator_unix.cpp
@@ -224,7 +224,7 @@ qt_extend_target(${target_name} CONDITION UNIX
         ../src/corelib/text/qlocale_unix.cpp
 )
 
-qt_extend_target(${target_name} CONDITION MACOS
+qt_internal_extend_target(${target_name} CONDITION MACOS
     SOURCES
         ../src/corelib/kernel/qcore_foundation.mm # special case
         ../src/corelib/kernel/qcore_mac.mm # special case
@@ -239,7 +239,7 @@ qt_extend_target(${target_name} CONDITION MACOS
 )
 
 # special case big
-extend_target(qmake CONDITION WIN32
+qt_internal_extend_target(qmake CONDITION WIN32
     SOURCES
         ../src/corelib/io/qfilesystemengine_win.cpp
         ../src/corelib/io/qfilesystemiterator_win.cpp
@@ -255,12 +255,12 @@ extend_target(qmake CONDITION WIN32
         ole32 advapi32 kernel32 netapi32
 )
 
-qt_extend_target(${target_name} CONDITION MINGW AND WIN32
+qt_internal_extend_target(${target_name} CONDITION MINGW AND WIN32
     PUBLIC_LIBRARIES
         uuid
 )
 
-qt_extend_target(${target_name} CONDITION CLANG AND WIN32
+qt_internal_extend_target(${target_name} CONDITION CLANG AND WIN32
     COMPILE_OPTIONS
         "-fms-compatibility-version=19.00.23506"
         "-Wno-microsoft-enum-value"
diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt
index 728e9371c7..48d3528546 100644
--- a/src/3rdparty/freetype/CMakeLists.txt
+++ b/src/3rdparty/freetype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## BundledFreetype Generic Library:
 #####################################################################
 
-qt_add_3rdparty_library(BundledFreetype
+qt_internal_add_3rdparty_library(BundledFreetype
     QMAKE_LIB_NAME freetype
     STATIC
     INSTALL
@@ -67,36 +67,36 @@ qt_set_symbol_visibility_hidden(BundledFreetype)
 ## Scopes:
 #####################################################################
 
-qt_extend_target(BundledFreetype CONDITION WIN32
+qt_internal_extend_target(BundledFreetype CONDITION WIN32
     SOURCES
         src/base/ftsystem.c
 )
 
-qt_extend_target(BundledFreetype CONDITION UNIX
+qt_internal_extend_target(BundledFreetype CONDITION UNIX
     SOURCES
         builds/unix/ftsystem.c
     INCLUDE_DIRECTORIES
         builds/unix
 )
 
-qt_extend_target(BundledFreetype CONDITION QT_FEATURE_png
+qt_internal_extend_target(BundledFreetype CONDITION QT_FEATURE_png
     DEFINES
         FT_CONFIG_OPTION_USE_PNG
     LIBRARIES
         WrapPNG::WrapPNG
 )
 
-qt_extend_target(BundledFreetype CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(BundledFreetype CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib
     INCLUDE_DIRECTORIES
         ../zlib/src
 )
 
-qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+qt_internal_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
     LIBRARIES
         Qt::Core
 )
diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
index b178d205d5..37b4c00784 100644
--- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## BundledHarfbuzz Generic Library:
 #####################################################################
 
-qt_add_3rdparty_library(BundledHarfbuzz
+qt_internal_add_3rdparty_library(BundledHarfbuzz
     QMAKE_LIB_NAME harfbuzz
     STATIC
     SOURCES
@@ -74,19 +74,19 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz)
 #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
 # SHAPERS = "coretext"
 
-qt_extend_target(BundledHarfbuzz CONDITION UNIX
+qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX
     DEFINES
         HAVE_PTHREAD
         HAVE_SCHED_H
         HAVE_SCHED_YIELD
 )
 
-qt_extend_target(BundledHarfbuzz CONDITION WIN32
+qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32
     DEFINES
         HB_NO_WIN1256
 )
 
-qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
+qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
     SOURCES
         src/hb-ot.h
         src/hb-ot-cff1-table.cc
@@ -147,7 +147,7 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
         HAVE_OT
 )
 
-qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
+qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
     SOURCES
         src/hb-fallback-shape.cc
     DEFINES
diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
index 2f895ab4d3..37e07f2350 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## BundledHarfbuzz Generic Library:
 #####################################################################
 
-qt_add_3rdparty_library(BundledHarfbuzz
+qt_internal_add_3rdparty_library(BundledHarfbuzz
     QMAKE_LIB_NAME harfbuzz
     STATIC
     SKIP_AUTOMOC # special case
@@ -76,19 +76,19 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz)
 #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
 # SHAPERS = "coretext"
 
-qt_extend_target(BundledHarfbuzz CONDITION UNIX
+qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX
     DEFINES
         HAVE_PTHREAD
         HAVE_SCHED_H
         HAVE_SCHED_YIELD
 )
 
-qt_extend_target(BundledHarfbuzz CONDITION WIN32
+qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32
     DEFINES
         HB_NO_WIN1256
 )
 
-qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case
+qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE # special case
     SOURCES
         src/hb-ot.h
         src/hb-ot-cff1-table.cc
@@ -149,7 +149,7 @@ qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case
         HAVE_OT
 )
 
-qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
+qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
     SOURCES
         src/hb-fallback-shape.cc
     DEFINES
diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt
index 24fca5d925..9ef367563b 100644
--- a/src/3rdparty/libpng/CMakeLists.txt
+++ b/src/3rdparty/libpng/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## BundledLibpng Generic Library:
 #####################################################################
 
-qt_add_3rdparty_library(BundledLibpng
+qt_internal_add_3rdparty_library(BundledLibpng
     QMAKE_LIB_NAME libpng
     STATIC
     INSTALL
@@ -39,17 +39,17 @@ qt_set_symbol_visibility_hidden(BundledLibpng)
 ## Scopes:
 #####################################################################
 
-qt_extend_target(BundledLibpng CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(BundledLibpng CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib
     INCLUDE_DIRECTORIES
         ../zlib/src
 )
 
-qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+qt_internal_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
     LIBRARIES
         Qt::Core
 )
diff --git a/src/3rdparty/pcre2/.prev_CMakeLists.txt b/src/3rdparty/pcre2/.prev_CMakeLists.txt
index 5efac810c7..e84899c227 100644
--- a/src/3rdparty/pcre2/.prev_CMakeLists.txt
+++ b/src/3rdparty/pcre2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## BundledPcre2 Generic Library:
 #####################################################################
 
-qt_add_3rdparty_library(BundledPcre2
+qt_internal_add_3rdparty_library(BundledPcre2
     QMAKE_LIB_NAME pcre2
     STATIC
     SOURCES
@@ -52,27 +52,27 @@ qt_set_symbol_visibility_hidden(BundledPcre2)
 ## Scopes:
 #####################################################################
 
-qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
+qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
     DEFINES
         PCRE2_DISABLE_JIT
 )
 
-qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
     DEFINES
         PCRE2_DISABLE_JIT
 )
 
-qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
     DEFINES
         PCRE2_DISABLE_JIT
 )
 
-qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
+qt_internal_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
     DEFINES
         PCRE2_DISABLE_JIT
 )
 
-qt_extend_target(BundledPcre2 CONDITION WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION WIN32
     PUBLIC_DEFINES
         PCRE2_STATIC
 )
diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt
index 575424c887..23b6e738cd 100644
--- a/src/3rdparty/pcre2/CMakeLists.txt
+++ b/src/3rdparty/pcre2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## BundledPcre2 Generic Library:
 #####################################################################
 
-qt_add_3rdparty_library(BundledPcre2
+qt_internal_add_3rdparty_library(BundledPcre2
     QMAKE_LIB_NAME pcre2
     STATIC
     SOURCES
@@ -52,27 +52,27 @@ qt_set_symbol_visibility_hidden(BundledPcre2)
 ## Scopes:
 #####################################################################
 
-qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
+qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
     DEFINES
         PCRE2_DISABLE_JIT
 )
 
-qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
     DEFINES
         PCRE2_DISABLE_JIT
 )
 
-qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
     DEFINES
         PCRE2_DISABLE_JIT
 )
 
-qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
+qt_internal_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
     DEFINES
         PCRE2_DISABLE_JIT
 )
 
-qt_extend_target(BundledPcre2 CONDITION WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION WIN32
     PUBLIC_DEFINES
         PCRE2_STATIC
 )
diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt
index 7422446040..876ddaf1ba 100644
--- a/src/concurrent/CMakeLists.txt
+++ b/src/concurrent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Concurrent Module:
 #####################################################################
 
-qt_add_module(Concurrent
+qt_internal_add_module(Concurrent
     EXCEPTIONS
     SOURCES
         qtaskbuilder.h
@@ -39,11 +39,11 @@ qt_add_module(Concurrent
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )
-qt_add_docs(Concurrent
+qt_internal_add_docs(Concurrent
     doc/qtconcurrent.qdocconf
 )
 
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index e024f49c93..59231ae521 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Core Module:
 #####################################################################
 
-qt_add_module(Core
+qt_internal_add_module(Core
     GENERATE_METATYPES
     QMAKE_MODULE_CONFIG moc resources
     EXCEPTIONS
@@ -233,7 +233,7 @@ qt_add_module(Core
 )
 
 
-qt_add_simd_part(Core SIMD mips_dsp
+qt_internal_add_simd_part(Core SIMD mips_dsp
     SOURCES
         ../gui/painting/qt_mips_asm_dsp_p.h
         text/qstring_mips_dsp_asm.S
@@ -297,12 +297,12 @@ endif()
 #### Keys ignored in scope 2:.:.:corelib.pro:QT_FEATURE_gc_binaries:
 # MODULE_CONFIG = "gc_binaries"
 
-qt_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY
+qt_internal_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY
     PUBLIC_DEFINES
         QT_NAMESPACE=
 )
 
-qt_extend_target(Core CONDITION ANDROID
+qt_internal_extend_target(Core CONDITION ANDROID
     SOURCES
         kernel/qsharedmemory_android.cpp
         kernel/qsystemsemaphore_android.cpp
@@ -310,7 +310,7 @@ qt_extend_target(Core CONDITION ANDROID
         LIBS_SUFFIX="_${CMAKE_SYSTEM_PROCESSOR}.so"
 )
 
-qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x67000000"
 )
@@ -318,7 +318,7 @@ qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386"
 #### Keys ignored in scope 6:.:.:corelib.pro:FREEBSD OR OPENBSD:
 # QMAKE_LFLAGS_NOUNDEF = <EMPTY>
 
-qt_extend_target(Core CONDITION QT_FEATURE_animation
+qt_internal_extend_target(Core CONDITION QT_FEATURE_animation
     SOURCES
         animation/qabstractanimation.cpp animation/qabstractanimation.h animation/qabstractanimation_p.h
         animation/qanimationgroup.cpp animation/qanimationgroup.h animation/qanimationgroup_p.h
@@ -329,7 +329,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_animation
         animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h
 )
 
-qt_extend_target(Core CONDITION WIN32
+qt_internal_extend_target(Core CONDITION WIN32
     SOURCES
         global/qoperatingsystemversion_win.cpp global/qoperatingsystemversion_win_p.h
         io/qfilesystemengine_win.cpp
@@ -368,7 +368,7 @@ qt_extend_target(Core CONDITION WIN32
         userenv
 )
 
-qt_extend_target(Core CONDITION APPLE
+qt_internal_extend_target(Core CONDITION APPLE
     SOURCES
         global/qoperatingsystemversion_darwin.mm
         io/qfilesystemengine_mac.mm
@@ -385,7 +385,7 @@ qt_extend_target(Core CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(Core CONDITION MACOS
+qt_internal_extend_target(Core CONDITION MACOS
     LIBRARIES
         ${FWAppKit}
         ${FWApplicationServices}
@@ -396,7 +396,7 @@ qt_extend_target(Core CONDITION MACOS
         ${FWIOKit}
 )
 
-qt_extend_target(Core CONDITION INTEGRITY
+qt_internal_extend_target(Core CONDITION INTEGRITY
     LIBRARIES
         ivfs
         net
@@ -430,26 +430,26 @@ qt_extend_target(Core CONDITION INTEGRITY
 #### Keys ignored in scope 27:.:global:global/global.pri:else:
 # f16c_cxx = "false"
 
-qt_extend_target(Core CONDITION _ss_f16c_cxx
+qt_internal_extend_target(Core CONDITION _ss_f16c_cxx
     DEFINES
         QFLOAT16_INCLUDE_FAST
 )
 
 if(NOT _ss_f16c_cxx)
-    qt_add_simd_part(Core SIMD f16c
+    qt_internal_add_simd_part(Core SIMD f16c
         SOURCES
             global/qfloat16_f16c.c
     )
 endif()
 
-qt_extend_target(Core CONDITION NOT CMAKE_CROSSCOMPILING AND NOT _x_-armcc_x_ AND NOT static AND (hurd_x_ OR linux_x_)
+qt_internal_extend_target(Core CONDITION NOT CMAKE_CROSSCOMPILING AND NOT _x_-armcc_x_ AND NOT static AND (hurd_x_ OR linux_x_)
     DEFINES
         ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\"
     LINK_OPTIONS
         "-Wl,-e,qt_core_boilerplate"
 )
 
-qt_extend_target(Core CONDITION LINUX AND NOT static
+qt_internal_extend_target(Core CONDITION LINUX AND NOT static
     SOURCES
         global/minimum-linux_p.h
 )
@@ -466,17 +466,17 @@ qt_extend_target(Core CONDITION LINUX AND NOT static
 #### Keys ignored in scope 35:.:global:global/global.pri:silent:
 # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&"
 
-qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
+qt_internal_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
     SOURCES
         global/minimum-linux.S
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_slog2
+qt_internal_extend_target(Core CONDITION QT_FEATURE_slog2
     LIBRARIES
         Slog2::Slog2
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_journald
+qt_internal_extend_target(Core CONDITION QT_FEATURE_journald
     LIBRARIES
         PkgConfig::Libsystemd
 )
@@ -493,12 +493,12 @@ qt_extend_target(Core CONDITION QT_FEATURE_journald
 #### Keys ignored in scope 40:.:global:global/global.pri:silent:
 # versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&"
 
-qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg
+qt_internal_extend_target(Core CONDITION NOT GCC OR NOT ltcg
     SOURCES
         global/qversiontagging.cpp
 )
 
-qt_extend_target(Core CONDITION UNIX
+qt_internal_extend_target(Core CONDITION UNIX
     SOURCES
         io/qfilesystemengine_unix.cpp
         io/qfilesystemiterator_unix.cpp
@@ -511,7 +511,7 @@ qt_extend_target(Core CONDITION UNIX
         thread/qthread_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_thread
+qt_internal_extend_target(Core CONDITION QT_FEATURE_thread
     SOURCES
         thread/qatomic.cpp thread/qatomic.h
         thread/qatomic_bootstrap.h
@@ -529,33 +529,33 @@ qt_extend_target(Core CONDITION QT_FEATURE_thread
         thread/qthreadstorage.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32
     SOURCES
         thread/qmutex_win.cpp
         thread/qwaitcondition_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX
     SOURCES
         thread/qwaitcondition_unix.cpp
 )
 
-qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread
     SOURCES
         thread/qmutex_mac.cpp
 )
 
-qt_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread
+qt_internal_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread
     SOURCES
         thread/qmutex_linux.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX
     SOURCES
         thread/qmutex_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_future
+qt_internal_extend_target(Core CONDITION QT_FEATURE_future
     SOURCES
         thread/qexception.cpp thread/qexception.h
         thread/qfuture.h
@@ -567,23 +567,23 @@ qt_extend_target(Core CONDITION QT_FEATURE_future
         thread/qresultstore.cpp thread/qresultstore.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64
+qt_internal_extend_target(Core CONDITION QT_FEATURE_std_atomic64
     PUBLIC_LIBRARIES
         WrapAtomic::WrapAtomic
 )
 
-qt_extend_target(Core CONDITION ICC
+qt_internal_extend_target(Core CONDITION ICC
     COMPILE_OPTIONS
         -fp-model
         strict
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(Core CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib
     SOURCES
         ../3rdparty/zlib/src/adler32.c
         ../3rdparty/zlib/src/compress.c
@@ -604,18 +604,18 @@ qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib
         ../3rdparty/zlib/src
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_commandlineparser
+qt_internal_extend_target(Core CONDITION QT_FEATURE_commandlineparser
     SOURCES
         tools/qcommandlineoption.cpp tools/qcommandlineoption.h
         tools/qcommandlineparser.cpp tools/qcommandlineparser.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion
+qt_internal_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion
     LIBRARIES
         WrapDoubleConversion::WrapDoubleConversion
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
+qt_internal_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
     SOURCES
         ../3rdparty/double-conversion/bignum.cc ../3rdparty/double-conversion/bignum.h
         ../3rdparty/double-conversion/bignum-dtoa.cc ../3rdparty/double-conversion/bignum-dtoa.h
@@ -633,38 +633,38 @@ qt_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_s
         ../3rdparty/double-conversion/include
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_system_libb2
+qt_internal_extend_target(Core CONDITION QT_FEATURE_system_libb2
     LIBRARIES
         PkgConfig::Libb2
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
+qt_internal_extend_target(Core CONDITION QT_FEATURE_easingcurve
     SOURCES
         tools/qeasingcurve.cpp tools/qeasingcurve.h
         tools/qtimeline.cpp tools/qtimeline.h
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS)
+qt_internal_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS)
     LIBRARIES
         m
 )
 
-qt_extend_target(Core CONDITION APPLE AND NOT NACL
+qt_internal_extend_target(Core CONDITION APPLE AND NOT NACL
     SOURCES
         text/qlocale_mac.mm
 )
 
-qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
     SOURCES
         text/qlocale_unix.cpp
 )
 
-qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE)
     SOURCES
         text/qlocale_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_icu
+qt_internal_extend_target(Core CONDITION QT_FEATURE_icu
     SOURCES
         text/qcollator_icu.cpp
         text/qlocale_icu.cpp
@@ -672,159 +672,159 @@ qt_extend_target(Core CONDITION QT_FEATURE_icu
         ICU::i18n ICU::uc ICU::data
 )
 
-qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
+qt_internal_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_win.cpp
 )
 
-qt_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu
+qt_internal_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_macx.cpp
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_icu
+qt_internal_extend_target(Core CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_posix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_regularexpression
+qt_internal_extend_target(Core CONDITION QT_FEATURE_regularexpression
     SOURCES
         text/qregularexpression.cpp text/qregularexpression.h
     LIBRARIES
         WrapPCRE2::WrapPCRE2
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_hijricalendar
+qt_internal_extend_target(Core CONDITION QT_FEATURE_hijricalendar
     SOURCES
         time/qhijricalendar.cpp time/qhijricalendar_p.h
         time/qhijricalendar_data_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
+qt_internal_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
     SOURCES
         time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_jalalicalendar
+qt_internal_extend_target(Core CONDITION QT_FEATURE_jalalicalendar
     SOURCES
         time/qjalalicalendar.cpp time/qjalalicalendar_p.h
         time/qjalalicalendar_data_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_timezone
+qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone
     SOURCES
         time/qtimezone.cpp time/qtimezone.h
         time/qtimezoneprivate.cpp time/qtimezoneprivate_p.h
         time/qtimezoneprivate_data_p.h
 )
 
-qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL
     SOURCES
         time/qtimezoneprivate_mac.mm
 )
 
-qt_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_android.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_tz.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_icu.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_icu.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_datetimeparser
+qt_internal_extend_target(Core CONDITION QT_FEATURE_datetimeparser
     SOURCES
         time/qdatetimeparser.cpp time/qdatetimeparser_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_zstd
+qt_internal_extend_target(Core CONDITION QT_FEATURE_zstd
     LIBRARIES
         ZSTD::ZSTD
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher
     SOURCES
         io/qfilesystemwatcher.cpp io/qfilesystemwatcher.h io/qfilesystemwatcher_p.h
         io/qfilesystemwatcher_polling.cpp io/qfilesystemwatcher_polling_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32
     SOURCES
         io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h
 )
 
-qt_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher
+qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher
     SOURCES
         io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS
     SOURCES
         io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
     SOURCES
         io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_processenvironment
+qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment
     SOURCES
         io/qprocess.cpp io/qprocess.h io/qprocess_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32
     SOURCES
         io/qprocess_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX
     SOURCES
         io/qprocess_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_settings
+qt_internal_extend_target(Core CONDITION QT_FEATURE_settings
     SOURCES
         io/qsettings.cpp io/qsettings.h io/qsettings_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32
     SOURCES
         io/qsettings_win.cpp
 )
 
-qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
     SOURCES
         io/qsettings_mac.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_settings AND WASM
+qt_internal_extend_target(Core CONDITION QT_FEATURE_settings AND WASM
     SOURCES
         io/qsettings_wasm.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32
     SOURCES
         io/qfilesystemiterator_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_process AND UNIX
     SOURCES
         ../3rdparty/forkfd/forkfd.h
         io/forkfd_qt.cpp
@@ -832,22 +832,22 @@ qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX
         ../3rdparty/forkfd
 )
 
-qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment
     SOURCES
         io/qprocess_darwin.mm
 )
 
-qt_extend_target(Core CONDITION APPLE AND NOT MACOS
+qt_internal_extend_target(Core CONDITION APPLE AND NOT MACOS
     PUBLIC_LIBRARIES
         ${FWMobileCoreServices}
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT APPLE
+qt_internal_extend_target(Core CONDITION UNIX AND NOT APPLE
     SOURCES
         kernel/qelapsedtimer_unix.cpp
 )
 
-qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED
+qt_internal_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED
     SOURCES
         io/qstandardpaths_android.cpp
         io/qstorageinfo_unix.cpp
@@ -856,7 +856,7 @@ qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED
         kernel/qjnionload.cpp
 )
 
-qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_internal_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         io/qstandardpaths_haiku.cpp
         io/qstorageinfo_unix.cpp
@@ -864,92 +864,92 @@ qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
         be
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_internal_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         io/qstandardpaths_unix.cpp
         io/qstorageinfo_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_proxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel
     SOURCES
         itemmodels/qabstractproxymodel.cpp itemmodels/qabstractproxymodel.h itemmodels/qabstractproxymodel_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel
     SOURCES
         itemmodels/qconcatenatetablesproxymodel.cpp itemmodels/qconcatenatetablesproxymodel.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel
     SOURCES
         itemmodels/qidentityproxymodel.cpp itemmodels/qidentityproxymodel.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel
     SOURCES
         itemmodels/qsortfilterproxymodel.cpp itemmodels/qsortfilterproxymodel.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel
     SOURCES
         itemmodels/qtransposeproxymodel.cpp itemmodels/qtransposeproxymodel.h itemmodels/qtransposeproxymodel_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_stringlistmodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_stringlistmodel
     SOURCES
         itemmodels/qstringlistmodel.cpp itemmodels/qstringlistmodel.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_library
+qt_internal_extend_target(Core CONDITION QT_FEATURE_library
     SOURCES
         plugin/qelfparser_p.cpp plugin/qelfparser_p.h
         plugin/qlibrary.cpp plugin/qlibrary.h plugin/qlibrary_p.h
         plugin/qmachparser.cpp plugin/qmachparser_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_library AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND UNIX
     SOURCES
         plugin/qlibrary_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_library AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND WIN32
     SOURCES
         plugin/qlibrary_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
+qt_internal_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
     LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(Core CONDITION APPLE AND (IOS OR TVOS)
+qt_internal_extend_target(Core CONDITION APPLE AND (IOS OR TVOS)
     LIBRARIES
         ${FWUIKit}
 )
 
-qt_extend_target(Core CONDITION WATCHOS
+qt_internal_extend_target(Core CONDITION WATCHOS
     LIBRARIES
         ${FWWatchKit}
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX
     SOURCES
         kernel/qpoll.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX
     SOURCES
         kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h
     LIBRARIES
         GLIB2::GLIB2
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
     LIBRARIES
         WrapRt::WrapRt
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT ANDROID
+qt_internal_extend_target(Core CONDITION UNIX AND NOT ANDROID
     SOURCES
         kernel/qsharedmemory_posix.cpp
         kernel/qsharedmemory_systemv.cpp
@@ -959,12 +959,12 @@ qt_extend_target(Core CONDITION UNIX AND NOT ANDROID
         kernel/qsystemsemaphore_unix.cpp
 )
 
-qt_extend_target(Core CONDITION VXWORKS
+qt_internal_extend_target(Core CONDITION VXWORKS
     SOURCES
         kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h
 )
 
-qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps
+qt_internal_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps
     SOURCES
         kernel/qppsattribute.cpp kernel/qppsattribute_p.h
         kernel/qppsattributeprivate_p.h
@@ -974,17 +974,17 @@ qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps
         PPS::PPS
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
+qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
     SOURCES
         serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter
+qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter
     SOURCES
         serialization/qcborstreamwriter.cpp serialization/qcborstreamwriter.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_mimetype
+qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype
     SOURCES
         mimetypes/qmimedatabase.cpp mimetypes/qmimedatabase.h mimetypes/qmimedatabase_p.h
         mimetypes/qmimeglobpattern.cpp mimetypes/qmimeglobpattern_p.h
@@ -999,7 +999,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
 # MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml"
 # OTHER_FILES = "$$MIME_DATABASE"
 
-qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database
+qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database
     INCLUDE_DIRECTORIES
         .rcc
 )
@@ -1031,14 +1031,14 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_data
 #### Keys ignored in scope 180:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
 # mimedb.commands = "--zstd"
 
-qt_extend_target(Core CONDITION WASM
+qt_internal_extend_target(Core CONDITION WASM
     SOURCES
         platform/wasm/qstdweb.cpp platform/wasm/qstdweb_p.h
 )
 
 
-qt_create_tracepoints(Core qtcore.tracepoints)
-qt_add_docs(Core
+qt_internal_create_tracepoints(Core qtcore.tracepoints)
+qt_internal_add_docs(Core
     doc/qtcore.qdocconf
 )
 
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 7a9256daf8..c32a3ab573 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -26,7 +26,7 @@ endif()
 ## Core Module:
 #####################################################################
 
-qt_add_module(Core
+qt_internal_add_module(Core
     GENERATE_METATYPES
     QMAKE_MODULE_CONFIG moc resources
     EXCEPTIONS
@@ -287,7 +287,7 @@ endif()
 
 # Handle QObject: Automoc does not work for this as it would
 # require to spill internals into users:
-qt_add_module(Core_qobject STATIC
+qt_internal_add_module(Core_qobject STATIC
     NO_SYNC_QT
     NO_CONFIG_HEADER_FILE
     NO_MODULE_HEADERS
@@ -307,7 +307,7 @@ set_target_properties(Core_qobject PROPERTIES
 )
 target_include_directories(Core_qobject PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/kernel") # for moc_qobject.cpp
 target_link_libraries(Core_qobject PRIVATE Qt::Platform Qt::GlobalConfig)
-extend_target(Core LIBRARIES Qt::Core_qobject)
+qt_internal_extend_target(Core LIBRARIES Qt::Core_qobject)
 add_dependencies(Core_qobject ${QT_CMAKE_EXPORT_NAMESPACE}::moc)
 
 set(core_qobject_metatypes_json_args)
@@ -355,7 +355,7 @@ if (LINUX AND NOT CMAKE_CROSSCOMPILING AND BUILD_SHARED_LIBS)
 endif()
 # special case end
 
-qt_add_simd_part(Core SIMD mips_dsp
+qt_internal_add_simd_part(Core SIMD mips_dsp
     SOURCES
         ../gui/painting/qt_mips_asm_dsp_p.h
         text/qstring_mips_dsp_asm.S
@@ -421,13 +421,13 @@ endif()
 
 # special case begin
 # remove because it's handled manually
-#qt_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY
+#qt_internal_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY
 #    PUBLIC_DEFINES
 #        QT_NAMESPACE=
 #)
 # special case end
 
-qt_extend_target(Core CONDITION ANDROID
+qt_internal_extend_target(Core CONDITION ANDROID
     SOURCES
         kernel/qsharedmemory_android.cpp
         kernel/qsystemsemaphore_android.cpp
@@ -435,7 +435,7 @@ qt_extend_target(Core CONDITION ANDROID
         LIBS_SUFFIX="_${ANDROID_ABI}.so" # special case
 )
 
-qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x67000000"
 )
@@ -443,7 +443,7 @@ qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386"
 #### Keys ignored in scope 6:.:.:corelib.pro:FREEBSD OR OPENBSD:
 # QMAKE_LFLAGS_NOUNDEF = <EMPTY>
 
-qt_extend_target(Core CONDITION QT_FEATURE_animation
+qt_internal_extend_target(Core CONDITION QT_FEATURE_animation
     SOURCES
         animation/qabstractanimation.cpp animation/qabstractanimation.h animation/qabstractanimation_p.h
         animation/qanimationgroup.cpp animation/qanimationgroup.h animation/qanimationgroup_p.h
@@ -454,7 +454,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_animation
         animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h
 )
 
-qt_extend_target(Core CONDITION WIN32
+qt_internal_extend_target(Core CONDITION WIN32
     SOURCES
         global/qoperatingsystemversion_win.cpp global/qoperatingsystemversion_win_p.h
         io/qfilesystemengine_win.cpp
@@ -492,7 +492,7 @@ qt_extend_target(Core CONDITION WIN32
         userenv
 )
 
-qt_extend_target(Core CONDITION APPLE
+qt_internal_extend_target(Core CONDITION APPLE
     SOURCES
         global/qoperatingsystemversion_darwin.mm
         io/qfilesystemengine_mac.mm
@@ -509,7 +509,7 @@ qt_extend_target(Core CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(Core CONDITION MACOS
+qt_internal_extend_target(Core CONDITION MACOS
     LIBRARIES
         ${FWAppKit}
         ${FWApplicationServices}
@@ -520,7 +520,7 @@ qt_extend_target(Core CONDITION MACOS
         ${FWIOKit}
 )
 
-qt_extend_target(Core CONDITION INTEGRITY
+qt_internal_extend_target(Core CONDITION INTEGRITY
     LIBRARIES
         ivfs
         net
@@ -554,11 +554,11 @@ qt_extend_target(Core CONDITION INTEGRITY
 #### Keys ignored in scope 27:.:global:global/global.pri:else:
 # f16c_cxx = "false"
 
-# extend_target(Core CONDITION _ss_f16c_cxx ... # special case remove: Handled manually
+# qt_internal_extend_target(Core CONDITION _ss_f16c_cxx ... # special case remove: Handled manually
 
 # special case begin
 # Remove this because it's handled manually
-#extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_)
+#qt_internal_extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_)
 #    DEFINES
 #        ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\"
 #    LINK_OPTIONS
@@ -566,7 +566,7 @@ qt_extend_target(Core CONDITION INTEGRITY
 #)
 # special case end
 
-qt_extend_target(Core CONDITION LINUX AND NOT static
+qt_internal_extend_target(Core CONDITION LINUX AND NOT static
     SOURCES
         global/minimum-linux_p.h
 )
@@ -583,17 +583,17 @@ qt_extend_target(Core CONDITION LINUX AND NOT static
 #### Keys ignored in scope 35:.:global:global/global.pri:silent:
 # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&"
 
-qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
+qt_internal_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
     SOURCES
         global/minimum-linux.S
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_slog2
+qt_internal_extend_target(Core CONDITION QT_FEATURE_slog2
     LIBRARIES
         Slog2::Slog2
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_journald
+qt_internal_extend_target(Core CONDITION QT_FEATURE_journald
     LIBRARIES
         PkgConfig::Libsystemd
 )
@@ -610,12 +610,12 @@ qt_extend_target(Core CONDITION QT_FEATURE_journald
 #### Keys ignored in scope 40:.:global:global/global.pri:silent:
 # versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&"
 
-qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg
+qt_internal_extend_target(Core CONDITION NOT GCC OR NOT ltcg
     SOURCES
         global/qversiontagging.cpp
 )
 
-qt_extend_target(Core CONDITION UNIX
+qt_internal_extend_target(Core CONDITION UNIX
     SOURCES
         io/qfilesystemengine_unix.cpp
         io/qfilesystemiterator_unix.cpp
@@ -628,7 +628,7 @@ qt_extend_target(Core CONDITION UNIX
         thread/qthread_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_thread
+qt_internal_extend_target(Core CONDITION QT_FEATURE_thread
     SOURCES
         thread/qatomic.cpp thread/qatomic.h
         thread/qatomic_bootstrap.h
@@ -646,33 +646,33 @@ qt_extend_target(Core CONDITION QT_FEATURE_thread
         thread/qthreadstorage.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32
     SOURCES
         thread/qmutex_win.cpp
         thread/qwaitcondition_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX
     SOURCES
         thread/qwaitcondition_unix.cpp
 )
 
-qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread
     SOURCES
         thread/qmutex_mac.cpp
 )
 
-qt_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread
+qt_internal_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread
     SOURCES
         thread/qmutex_linux.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX
     SOURCES
         thread/qmutex_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_future
+qt_internal_extend_target(Core CONDITION QT_FEATURE_future
     SOURCES
         thread/qexception.cpp thread/qexception.h
         thread/qfuture.h
@@ -684,23 +684,23 @@ qt_extend_target(Core CONDITION QT_FEATURE_future
         thread/qresultstore.cpp thread/qresultstore.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64
+qt_internal_extend_target(Core CONDITION QT_FEATURE_std_atomic64
     PUBLIC_LIBRARIES
         WrapAtomic::WrapAtomic
 )
 
-qt_extend_target(Core CONDITION ICC
+qt_internal_extend_target(Core CONDITION ICC
     COMPILE_OPTIONS
         -fp-model
         strict
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(Core CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib
     SOURCES
         ../3rdparty/zlib/src/adler32.c
         ../3rdparty/zlib/src/compress.c
@@ -721,18 +721,18 @@ qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib
         ../3rdparty/zlib/src
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_commandlineparser
+qt_internal_extend_target(Core CONDITION QT_FEATURE_commandlineparser
     SOURCES
         tools/qcommandlineoption.cpp tools/qcommandlineoption.h
         tools/qcommandlineparser.cpp tools/qcommandlineparser.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion
+qt_internal_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion
     LIBRARIES
         WrapDoubleConversion::WrapDoubleConversion
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
+qt_internal_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
     SOURCES
         ../3rdparty/double-conversion/bignum.cc ../3rdparty/double-conversion/bignum.h
         ../3rdparty/double-conversion/bignum-dtoa.cc ../3rdparty/double-conversion/bignum-dtoa.h
@@ -750,38 +750,38 @@ qt_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_s
         ../3rdparty/double-conversion/include
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_system_libb2
+qt_internal_extend_target(Core CONDITION QT_FEATURE_system_libb2
     LIBRARIES
         PkgConfig::Libb2
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
+qt_internal_extend_target(Core CONDITION QT_FEATURE_easingcurve
     SOURCES
         tools/qeasingcurve.cpp tools/qeasingcurve.h
         tools/qtimeline.cpp tools/qtimeline.h
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS)
+qt_internal_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS)
     LIBRARIES
         m
 )
 
-qt_extend_target(Core CONDITION APPLE AND NOT NACL
+qt_internal_extend_target(Core CONDITION APPLE AND NOT NACL
     SOURCES
         text/qlocale_mac.mm
 )
 
-qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
     SOURCES
         text/qlocale_unix.cpp
 )
 
-qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE)
     SOURCES
         text/qlocale_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_icu
+qt_internal_extend_target(Core CONDITION QT_FEATURE_icu
     SOURCES
         text/qcollator_icu.cpp
         text/qlocale_icu.cpp
@@ -789,159 +789,159 @@ qt_extend_target(Core CONDITION QT_FEATURE_icu
         ICU::i18n ICU::uc ICU::data
 )
 
-qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
+qt_internal_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_win.cpp
 )
 
-qt_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu
+qt_internal_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_macx.cpp
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_icu
+qt_internal_extend_target(Core CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_posix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_regularexpression
+qt_internal_extend_target(Core CONDITION QT_FEATURE_regularexpression
     SOURCES
         text/qregularexpression.cpp text/qregularexpression.h
     LIBRARIES
         WrapPCRE2::WrapPCRE2
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_hijricalendar
+qt_internal_extend_target(Core CONDITION QT_FEATURE_hijricalendar
     SOURCES
         time/qhijricalendar.cpp time/qhijricalendar_p.h
         time/qhijricalendar_data_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
+qt_internal_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
     SOURCES
         time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_jalalicalendar
+qt_internal_extend_target(Core CONDITION QT_FEATURE_jalalicalendar
     SOURCES
         time/qjalalicalendar.cpp time/qjalalicalendar_p.h
         time/qjalalicalendar_data_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_timezone
+qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone
     SOURCES
         time/qtimezone.cpp time/qtimezone.h
         time/qtimezoneprivate.cpp time/qtimezoneprivate_p.h
         time/qtimezoneprivate_data_p.h
 )
 
-qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL
     SOURCES
         time/qtimezoneprivate_mac.mm
 )
 
-qt_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_android.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_tz.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_icu.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_icu.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
     SOURCES
         time/qtimezoneprivate_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_datetimeparser
+qt_internal_extend_target(Core CONDITION QT_FEATURE_datetimeparser
     SOURCES
         time/qdatetimeparser.cpp time/qdatetimeparser_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_zstd
+qt_internal_extend_target(Core CONDITION QT_FEATURE_zstd
     LIBRARIES
         ZSTD::ZSTD
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher
     SOURCES
         io/qfilesystemwatcher.cpp io/qfilesystemwatcher.h io/qfilesystemwatcher_p.h
         io/qfilesystemwatcher_polling.cpp io/qfilesystemwatcher_polling_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32
     SOURCES
         io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h
 )
 
-qt_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher
+qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher
     SOURCES
         io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS
     SOURCES
         io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
     SOURCES
         io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_processenvironment
+qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment
     SOURCES
         io/qprocess.cpp io/qprocess.h io/qprocess_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32
     SOURCES
         io/qprocess_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX
     SOURCES
         io/qprocess_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_settings
+qt_internal_extend_target(Core CONDITION QT_FEATURE_settings
     SOURCES
         io/qsettings.cpp io/qsettings.h io/qsettings_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32
     SOURCES
         io/qsettings_win.cpp
 )
 
-qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
     SOURCES
         io/qsettings_mac.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_settings AND WASM
+qt_internal_extend_target(Core CONDITION QT_FEATURE_settings AND WASM
     SOURCES
         io/qsettings_wasm.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32
     SOURCES
         io/qfilesystemiterator_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_process AND UNIX
     SOURCES
         ../3rdparty/forkfd/forkfd.h
         io/forkfd_qt.cpp
@@ -949,22 +949,22 @@ qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX
         ../3rdparty/forkfd
 )
 
-qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment
+qt_internal_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment
     SOURCES
         io/qprocess_darwin.mm
 )
 
-qt_extend_target(Core CONDITION APPLE AND NOT MACOS
+qt_internal_extend_target(Core CONDITION APPLE AND NOT MACOS
     PUBLIC_LIBRARIES
         ${FWMobileCoreServices}
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT APPLE
+qt_internal_extend_target(Core CONDITION UNIX AND NOT APPLE
     SOURCES
         kernel/qelapsedtimer_unix.cpp
 )
 
-qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED
+qt_internal_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED
     SOURCES
         io/qstandardpaths_android.cpp
         io/qstorageinfo_unix.cpp
@@ -973,7 +973,7 @@ qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED
         kernel/qjnionload.cpp
 )
 
-qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_internal_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         io/qstandardpaths_haiku.cpp
         io/qstorageinfo_unix.cpp
@@ -981,92 +981,92 @@ qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
         be
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_internal_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         io/qstandardpaths_unix.cpp
         io/qstorageinfo_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_proxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel
     SOURCES
         itemmodels/qabstractproxymodel.cpp itemmodels/qabstractproxymodel.h itemmodels/qabstractproxymodel_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel
     SOURCES
         itemmodels/qconcatenatetablesproxymodel.cpp itemmodels/qconcatenatetablesproxymodel.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel
     SOURCES
         itemmodels/qidentityproxymodel.cpp itemmodels/qidentityproxymodel.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel
     SOURCES
         itemmodels/qsortfilterproxymodel.cpp itemmodels/qsortfilterproxymodel.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel
     SOURCES
         itemmodels/qtransposeproxymodel.cpp itemmodels/qtransposeproxymodel.h itemmodels/qtransposeproxymodel_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_stringlistmodel
+qt_internal_extend_target(Core CONDITION QT_FEATURE_stringlistmodel
     SOURCES
         itemmodels/qstringlistmodel.cpp itemmodels/qstringlistmodel.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_library
+qt_internal_extend_target(Core CONDITION QT_FEATURE_library
     SOURCES
         plugin/qelfparser_p.cpp plugin/qelfparser_p.h
         plugin/qlibrary.cpp plugin/qlibrary.h plugin/qlibrary_p.h
         plugin/qmachparser.cpp plugin/qmachparser_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_library AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND UNIX
     SOURCES
         plugin/qlibrary_unix.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_library AND WIN32
+qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND WIN32
     SOURCES
         plugin/qlibrary_win.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
+qt_internal_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
     LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(Core CONDITION APPLE AND (IOS OR TVOS)
+qt_internal_extend_target(Core CONDITION APPLE AND (IOS OR TVOS)
     LIBRARIES
         ${FWUIKit}
 )
 
-qt_extend_target(Core CONDITION WATCHOS
+qt_internal_extend_target(Core CONDITION WATCHOS
     LIBRARIES
         ${FWWatchKit}
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX
     SOURCES
         kernel/qpoll.cpp
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX
     SOURCES
         kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h
     LIBRARIES
         GLIB2::GLIB2
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
+qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
     LIBRARIES
         WrapRt::WrapRt
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT ANDROID
+qt_internal_extend_target(Core CONDITION UNIX AND NOT ANDROID
     SOURCES
         kernel/qsharedmemory_posix.cpp
         kernel/qsharedmemory_systemv.cpp
@@ -1076,12 +1076,12 @@ qt_extend_target(Core CONDITION UNIX AND NOT ANDROID
         kernel/qsystemsemaphore_unix.cpp
 )
 
-qt_extend_target(Core CONDITION VXWORKS
+qt_internal_extend_target(Core CONDITION VXWORKS
     SOURCES
         kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h
 )
 
-qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps
+qt_internal_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps
     SOURCES
         kernel/qppsattribute.cpp kernel/qppsattribute_p.h
         kernel/qppsattributeprivate_p.h
@@ -1091,17 +1091,17 @@ qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps
         PPS::PPS
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
+qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
     SOURCES
         serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter
+qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter
     SOURCES
         serialization/qcborstreamwriter.cpp serialization/qcborstreamwriter.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_mimetype
+qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype
     SOURCES
         mimetypes/qmimedatabase.cpp mimetypes/qmimedatabase.h mimetypes/qmimedatabase_p.h
         mimetypes/qmimeglobpattern.cpp mimetypes/qmimeglobpattern_p.h
@@ -1117,7 +1117,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
 # OTHER_FILES = "$$MIME_DATABASE"
 
 # special case begin
-# qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database
+# qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database
 #        INCLUDE_DIRECTORIES
 #        .rcc
 #)
@@ -1189,7 +1189,7 @@ endif()
 
 # special case end
 
-qt_extend_target(Core CONDITION WASM
+qt_internal_extend_target(Core CONDITION WASM
     SOURCES
         platform/wasm/qstdweb.cpp platform/wasm/qstdweb_p.h
 )
@@ -1198,12 +1198,12 @@ qt_extend_target(Core CONDITION WASM
 # needs refinement for the other compiler specific cases.
 if(TEST_arch_${TEST_architecture_arch}_subarch_f16c)
     # Equivalent to contains(QT_CPU_FEATURES.$$QT_ARCH, f16c)
-    extend_target(Core
+    qt_internal_extend_target(Core
         DEFINES
             QFLOAT16_INCLUDE_FAST
     )
 else()
-    qt_add_simd_part(Core SIMD f16c
+    qt_internal_add_simd_part(Core SIMD f16c
         SOURCES
             global/qfloat16_f16c.c
     )
@@ -1245,13 +1245,13 @@ if(APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET)
 endif()
 # special case end
 
-qt_create_tracepoints(Core qtcore.tracepoints)
+qt_internal_create_tracepoints(Core qtcore.tracepoints)
 # special case begin
 if(TARGET Core_tracepoints_header)
     add_dependencies(Core_qobject Core_tracepoints_header)
 endif()
 # special case end
-qt_add_docs(Core
+qt_internal_add_docs(Core
     doc/qtcore.qdocconf
 )
 
@@ -1259,7 +1259,7 @@ qt_add_docs(Core
 # Handle qtzlib.pro to create headers for the
 # QtZlibPrivate target, equivalent to Qt += zlib-private
 if(NOT QT_FEATURE_system_zlib)
-    qt_add_module(Zlib
+    qt_internal_add_module(Zlib
         INTERNAL_MODULE
         HEADER_MODULE
         NO_CONFIG_HEADER_FILE
diff --git a/src/corelib/mimetypes/mimetypes_resources.cmake b/src/corelib/mimetypes/mimetypes_resources.cmake
index a91d25cc2c..4b89c8aa9e 100644
--- a/src/corelib/mimetypes/mimetypes_resources.cmake
+++ b/src/corelib/mimetypes/mimetypes_resources.cmake
@@ -12,7 +12,7 @@ function(corelib_add_mimetypes_resources target)
     set_source_files_properties("${source_file}"
         PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
     )
-    qt_add_resource(${target} "mimetypes"
+    qt_internal_add_resource(${target} "mimetypes"
         PREFIX
             "/qt-project.org/qmime/packages"
         FILES
diff --git a/src/dbus/.prev_CMakeLists.txt b/src/dbus/.prev_CMakeLists.txt
index 1136ebe19b..a8a1c21612 100644
--- a/src/dbus/.prev_CMakeLists.txt
+++ b/src/dbus/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## DBus Module:
 #####################################################################
 
-qt_add_module(DBus
+qt_internal_add_module(DBus
     QMAKE_MODULE_CONFIG dbusadaptors dbusinterfaces
     SOURCES
         dbus_minimal_p.h
@@ -56,21 +56,21 @@ qt_add_module(DBus
 ## Scopes:
 #####################################################################
 
-qt_extend_target(DBus CONDITION QT_FEATURE_dbus_linked
+qt_internal_extend_target(DBus CONDITION QT_FEATURE_dbus_linked
     DEFINES
         QT_LINKED_LIBDBUS
     LIBRARIES
         dbus-1
 )
 
-qt_extend_target(DBus CONDITION WIN32
+qt_internal_extend_target(DBus CONDITION WIN32
     LIBRARIES
         advapi32
         netapi32
         user32
         ws2_32
 )
-qt_add_docs(DBus
+qt_internal_add_docs(DBus
     doc/qtdbus.qdocconf
 )
 
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index ea1d7abaa1..d7a82f9fe3 100644
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## DBus Module:
 #####################################################################
 
-qt_add_module(DBus
+qt_internal_add_module(DBus
     QMAKE_MODULE_CONFIG dbusadaptors dbusinterfaces
     SOURCES
         dbus_minimal_p.h
@@ -59,21 +59,21 @@ set_source_files_properties(qdbusmarshaller.cpp
 ## Scopes:
 #####################################################################
 
-qt_extend_target(DBus CONDITION QT_FEATURE_dbus_linked
+qt_internal_extend_target(DBus CONDITION QT_FEATURE_dbus_linked
     DEFINES
         QT_LINKED_LIBDBUS
     LIBRARIES
         dbus-1
 )
 
-qt_extend_target(DBus CONDITION WIN32
+qt_internal_extend_target(DBus CONDITION WIN32
     LIBRARIES
         advapi32
         netapi32
         user32
         ws2_32
 )
-qt_add_docs(DBus
+qt_internal_add_docs(DBus
     doc/qtdbus.qdocconf
 )
 
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index f0c3dd1662..8f86f91e9c 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Gui Module:
 #####################################################################
 
-qt_add_module(Gui
+qt_internal_add_module(Gui
     GENERATE_METATYPES
     PLUGIN_TYPES accessiblebridge platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
     SOURCES
@@ -238,7 +238,7 @@ set(qpdf_resource_files
     "qpdfa_metadata.xml"
 )
 
-qt_add_resource(Gui "qpdf"
+qt_internal_add_resource(Gui "qpdf"
     PREFIX
         "/qpdf/"
     BASE
@@ -258,7 +258,7 @@ endif()
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Gui CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl
     SOURCES
         kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
         kernel/qopenglcontext_platform.h
@@ -275,7 +275,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
 #### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl:
 # MODULE_CONFIG = "opengl"
 
-qt_extend_target(Gui CONDITION MACOS
+qt_internal_extend_target(Gui CONDITION MACOS
     SOURCES
         platform/macos/qcocoaplatforminterface.mm
     LIBRARIES
@@ -284,7 +284,7 @@ qt_extend_target(Gui CONDITION MACOS
         ${FWAppKit}
 )
 
-qt_extend_target(Gui CONDITION APPLE
+qt_internal_extend_target(Gui CONDITION APPLE
     SOURCES
         image/qimage_darwin.mm
         painting/qcoregraphics.mm painting/qcoregraphics_p.h
@@ -301,12 +301,12 @@ qt_extend_target(Gui CONDITION APPLE
         ${FWImageIO}
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_animation
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_animation
     SOURCES
         animation/qguivariantanimation.cpp
 )
 
-qt_extend_target(Gui CONDITION WIN32
+qt_internal_extend_target(Gui CONDITION WIN32
     SOURCES
         image/qpixmap_win.cpp
         kernel/qwindowdefs_win.h
@@ -334,7 +334,7 @@ qt_extend_target(Gui CONDITION WIN32
 #### Keys ignored in scope 7:.:.:gui.pro:WIN32:
 # CMAKE_WINDOWS_BUILD = "True"
 
-qt_extend_target(Gui CONDITION QT_FEATURE_egl
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl
     SOURCES
         opengl/platform/egl/qeglconvenience.cpp opengl/platform/egl/qeglconvenience_p.h
         opengl/platform/egl/qeglstreamconvenience.cpp opengl/platform/egl/qeglstreamconvenience_p.h
@@ -376,7 +376,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_egl
 #### Keys ignored in scope 18:.:.:gui.pro:APPLE:
 # CMAKE_GL_HEADER_NAME = "gl.h"
 
-qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility
     SOURCES
         accessible/qaccessible.cpp accessible/qaccessible.h
         accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h
@@ -387,14 +387,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
         accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h
 )
 
-qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
+qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
     SOURCES
         accessible/qaccessiblecache_mac.mm
     LIBRARIES
         ${FWFoundation}
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32
     SOURCES
         accessible/windows/apisupport/qwindowsuiawrapper.cpp accessible/windows/apisupport/qwindowsuiawrapper_p.h
         accessible/windows/apisupport/uiaattributeids_p.h
@@ -409,7 +409,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32
         accessible/windows/apisupport/uiatypes_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge
     SOURCES
         accessible/linux/atspiadaptor.cpp accessible/linux/atspiadaptor_p.h
         accessible/linux/dbusconnection.cpp accessible/linux/dbusconnection_p.h
@@ -426,13 +426,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibi
         PkgConfig::ATSPI2_nolink
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_action
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_action
     SOURCES
         kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
         kernel/qactiongroup.cpp kernel/qactiongroup.h kernel/qactiongroup_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_draganddrop
     SOURCES
         kernel/qdnd.cpp kernel/qdnd_p.h
         kernel/qdrag.cpp kernel/qdrag.h
@@ -441,19 +441,19 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
         kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_shortcut
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_shortcut
     SOURCES
         kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
         kernel/qshortcut.cpp kernel/qshortcut.h kernel/qshortcut_p.h
         kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_movie
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_movie
     SOURCES
         image/qmovie.cpp image/qmovie.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_png
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_png
     SOURCES
         image/qpnghandler.cpp image/qpnghandler_p.h
     LIBRARIES
@@ -463,69 +463,69 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png
 #### Keys ignored in scope 40:.: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)
+qt_internal_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0)
     COMPILE_OPTIONS
         -fno-reorder-blocks-and-partition
 )
 
 if(NOT ANDROID)
-    qt_add_simd_part(Gui SIMD sse2
+    qt_internal_add_simd_part(Gui SIMD sse2
         SOURCES
             painting/qdrawhelper_sse2.cpp
     )
 
-    qt_add_simd_part(Gui SIMD ssse3
+    qt_internal_add_simd_part(Gui SIMD ssse3
         SOURCES
             image/qimage_ssse3.cpp
             painting/qdrawhelper_ssse3.cpp
     )
 
-    qt_add_simd_part(Gui SIMD sse4_1
+    qt_internal_add_simd_part(Gui SIMD sse4_1
         SOURCES
             painting/qdrawhelper_sse4.cpp
             painting/qimagescale_sse4.cpp
     )
 
-    qt_add_simd_part(Gui SIMD neon
+    qt_internal_add_simd_part(Gui SIMD neon
         SOURCES
             image/qimage_neon.cpp
             painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
             painting/qimagescale_neon.cpp
     )
 
-    qt_add_simd_part(Gui SIMD mips_dsp
+    qt_internal_add_simd_part(Gui SIMD mips_dsp
         SOURCES
             painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
             painting/qdrawhelper_mips_dsp_asm.S
             painting/qt_mips_asm_dsp_p.h
     )
 
-    qt_add_simd_part(Gui SIMD mips_dspr2
+    qt_internal_add_simd_part(Gui SIMD mips_dspr2
         SOURCES
             image/qimage_mips_dspr2.cpp
             image/qimage_mips_dspr2_asm.S
             painting/qdrawhelper_mips_dspr2_asm.S
     )
 
-    qt_add_simd_part(Gui SIMD arch_haswell
+    qt_internal_add_simd_part(Gui SIMD arch_haswell
         SOURCES
             painting/qdrawhelper_avx2.cpp
     )
 endif()
 
-qt_extend_target(Gui CONDITION ANDROID
+qt_internal_extend_target(Gui CONDITION ANDROID
     SOURCES
         platform/android/qandroidplatforminterface.cpp
 )
 
-qt_extend_target(Gui CONDITION (NOT (NOT ANDROID)) AND (TEST_architecture_arch STREQUAL arm64 ORTEST_architecture_arch STREQUAL arm)
+qt_internal_extend_target(Gui CONDITION (NOT (NOT ANDROID)) AND (TEST_architecture_arch STREQUAL arm64 ORTEST_architecture_arch STREQUAL arm)
     SOURCES
         image/qimage_neon.cpp
         painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
         painting/qimagescale_neon.cpp
 )
 
-qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64)
+qt_internal_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64)
     SOURCES
         image/qimage_ssse3.cpp
         painting/qdrawhelper_sse2.cpp
@@ -536,14 +536,14 @@ qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386
         QT_COMPILER_SUPPORTS_SSSE3 QT_COMPILER_SUPPORTS_SSSE3
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_harfbuzz
     SOURCES
         text/qharfbuzzng.cpp text/qharfbuzzng_p.h
     LIBRARIES
         WrapHarfbuzz::WrapHarfbuzz
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_textodfwriter
     SOURCES
         text/qtextodfwriter.cpp text/qtextodfwriter_p.h
         text/qzip.cpp
@@ -551,17 +551,17 @@ qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter
         text/qzipwriter_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader
     SOURCES
         text/qtextmarkdownimporter.cpp text/qtextmarkdownimporter_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader
     LIBRARIES
         libmd4c
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader
     SOURCES
         ../3rdparty/md4c/md4c.c ../3rdparty/md4c/md4c.h
     DEFINES
@@ -570,18 +570,18 @@ qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_
         ../3rdparty/md4c
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter
     SOURCES
         text/qtextmarkdownwriter.cpp text/qtextmarkdownwriter_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_cssparser
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_cssparser
     SOURCES
         painting/qcssutil.cpp
         text/qcssparser.cpp text/qcssparser_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_freetype
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype
     SOURCES
         text/freetype/qfontengine_ft.cpp text/freetype/qfontengine_ft_p.h
         text/freetype/qfreetypefontdatabase.cpp text/freetype/qfreetypefontdatabase_p.h
@@ -589,12 +589,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_freetype
         WrapFreetype::WrapFreetype
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE
     SOURCES
         text/unix/qgenericunixfontdatabase_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE
     SOURCES
         text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h
         text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h
@@ -602,61 +602,61 @@ qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND
         Fontconfig::Fontconfig
 )
 
-qt_extend_target(Gui CONDITION APPLE AND NOT MACOS
+qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
     LIBRARIES
         ${FWUIKit}
 )
 
-qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_freetype
+qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_freetype
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND WIN32
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype AND WIN32
     SOURCES
         text/windows/qwindowsfontdatabase_ft.cpp text/windows/qwindowsfontdatabase_ft_p.h
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32
     SOURCES
         text/windows/qwindowsfontenginedirectwrite.cpp text/windows/qwindowsfontenginedirectwrite_p.h
     LIBRARIES
         d2d1
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32
     SOURCES
         text/windows/qwindowsdirectwritefontdatabase.cpp text/windows/qwindowsdirectwritefontdatabase_p.h
     LIBRARIES
         dwrite_3
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite3
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite3
     LIBRARIES
         dwrite_2
 )
 
-qt_extend_target(Gui CONDITION MINGW AND WIN32
+qt_internal_extend_target(Gui CONDITION MINGW AND WIN32
     LIBRARIES
         uuid
 )
 
-qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT
+qt_internal_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT
     DEFINES
         ENABLE_PIXMAN_DRAWHELPERS
 )
 
 if(UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT)
-    qt_add_simd_part(Gui SIMD neon
+    qt_internal_add_simd_part(Gui SIMD neon
         SOURCES
             ../3rdparty/pixman/pixman-arm-neon-asm.S
             painting/qdrawhelper_neon_asm.S
     )
 endif()
 
-qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64
+qt_internal_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64
     SOURCES
         painting/qdrawhelper_sse4.cpp
         painting/qimagescale_sse4.cpp
@@ -665,78 +665,78 @@ qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_6
         QT_COMPILER_SUPPORTS_SSE4_2
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib
     INCLUDE_DIRECTORIES
         ../3rdparty/zlib/src
 )
 
-qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
     LIBRARIES
         Qt::Core
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_regularexpression
     SOURCES
         util/qshadergenerator.cpp util/qshadergenerator_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_undocommand
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_undocommand
     SOURCES
         util/qundostack.cpp util/qundostack.h util/qundostack_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup
     SOURCES
         util/qundogroup.cpp util/qundogroup.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h
     LIBRARIES
         X11::X11
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_opengl
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_opengl
     SOURCES
         opengl/platform/egl/qeglpbuffer.cpp opengl/platform/egl/qeglpbuffer_p.h
         opengl/platform/egl/qeglplatformcontext.cpp opengl/platform/egl/qeglplatformcontext_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_egl_x11
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_egl_x11
     SOURCES
         opengl/platform/egl/qxlibeglintegration.cpp opengl/platform/egl/qxlibeglintegration_p.h
     LIBRARIES
         X11::X11
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11
     DEFINES
         QT_EGL_NO_X11
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_dlopen AND QT_FEATURE_egl
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_dlopen AND QT_FEATURE_egl
     LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
     SOURCES
         itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_filesystemmodel
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_filesystemmodel
     SOURCES
         itemmodels/qfileinfogatherer.cpp itemmodels/qfileinfogatherer_p.h
         itemmodels/qfilesystemmodel.cpp itemmodels/qfilesystemmodel.h itemmodels/qfilesystemmodel_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_vulkan
     SOURCES
         rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
         rhi/qrhivulkan_p_p.h
@@ -771,12 +771,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
 #### Keys ignored in scope 113:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
-qt_extend_target(Gui CONDITION WASM
+qt_internal_extend_target(Gui CONDITION WASM
     SOURCES
         platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h
 )
 
-qt_extend_target(Gui CONDITION UNIX
+qt_internal_extend_target(Gui CONDITION UNIX
     SOURCES
         platform/unix/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h
         platform/unix/qunixeventdispatcher.cpp
@@ -784,29 +784,29 @@ qt_extend_target(Gui CONDITION UNIX
         platform/unix/qunixplatforminterface.cpp
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
     SOURCES
         platform/unix/qeventdispatcher_glib.cpp platform/unix/qeventdispatcher_glib_p.h
     LIBRARIES
         GLIB2::GLIB2
 )
 
-qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         platform/unix/qgenericunixservices.cpp platform/unix/qgenericunixservices_p.h
 )
 
-qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
     LIBRARIES
         Qt::DBus
 )
 
-qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         platform/unix/qgenericunixthemes.cpp platform/unix/qgenericunixthemes_p.h
 )
 
-qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         platform/unix/dbusmenu/qdbusmenuadaptor.cpp platform/unix/dbusmenu/qdbusmenuadaptor_p.h
         platform/unix/dbusmenu/qdbusmenubar.cpp platform/unix/dbusmenu/qdbusmenubar_p.h
@@ -816,7 +816,7 @@ qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR N
         platform/unix/dbusmenu/qdbusplatformmenu.cpp platform/unix/dbusmenu/qdbusplatformmenu_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         platform/unix/dbustray/qdbustrayicon.cpp platform/unix/dbustray/qdbustrayicon_p.h
         platform/unix/dbustray/qdbustraytypes.cpp platform/unix/dbustray/qdbustraytypes_p.h
@@ -824,7 +824,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND
         platform/unix/dbustray/qxdgnotificationproxy.cpp platform/unix/dbustray/qxdgnotificationproxy_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
     SOURCES
         platform/unix/qxkbcommon.cpp platform/unix/qxkbcommon_p.h
         platform/unix/qxkbcommon_3rdparty.cpp
@@ -832,7 +832,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
         XKB::XKB
 )
 
-qt_extend_target(Gui CONDITION IOS OR MACOS
+qt_internal_extend_target(Gui CONDITION IOS OR MACOS
     SOURCES
         rhi/qrhimetal.mm rhi/qrhimetal_p.h
         rhi/qrhimetal_p_p.h
@@ -840,7 +840,7 @@ qt_extend_target(Gui CONDITION IOS OR MACOS
         ${FWMetal}
 )
 
-qt_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_internal_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5
     SOURCES
         painting/qdrawhelper.cpp
     NO_PCH_SOURCES
@@ -848,8 +848,8 @@ qt_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL
 )
 
 
-qt_create_tracepoints(Gui qtgui.tracepoints)
-qt_add_docs(Gui
+qt_internal_create_tracepoints(Gui qtgui.tracepoints)
+qt_internal_add_docs(Gui
     doc/qtgui.qdocconf
 )
 
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 6d496e2d7f..29ae78aa04 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -52,7 +52,7 @@ endif()
 
 # special case end
 
-qt_add_module(Gui
+qt_internal_add_module(Gui
     GENERATE_METATYPES
     PLUGIN_TYPES accessiblebridge platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
     FEATURE_DEPENDENCIES  # special case:
@@ -292,7 +292,7 @@ set(qpdf_resource_files
     "qpdfa_metadata.xml"
 )
 
-qt_add_resource(Gui "qpdf"
+qt_internal_add_resource(Gui "qpdf"
     PREFIX
         "/qpdf/"
     BASE
@@ -307,7 +307,7 @@ if(QT_FEATURE_reduce_relocations AND UNIX AND GCC)
 endif()
 
 # special case begin
-qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
     SOURCES
         itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h
 )
@@ -327,7 +327,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
 # feature is available).
 # On Windows with 'dynamic' OpenGL we must not link to opengl32.
 # DO NOT MOVE THIS TO THE BEGINNING OF THE FILE, the feature variables are not
-# available until the qt_add_module call.
+# available until the qt_internal_add_module call.
 if(QT_FEATURE_opengl)
     if(QT_FEATURE_opengles2)
         find_package(GLESv2)
@@ -338,7 +338,7 @@ if(QT_FEATURE_opengl)
 endif()
 # special case end
 
-qt_extend_target(Gui CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl
     SOURCES
         kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
         kernel/qopenglcontext_platform.h
@@ -352,7 +352,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
         rhi/qrhigles2_p_p.h
 )
 
-qt_extend_target(Gui CONDITION ANDROID
+qt_internal_extend_target(Gui CONDITION ANDROID
     SOURCES
         platform/android/qandroidplatforminterface.cpp
 )
@@ -360,7 +360,7 @@ qt_extend_target(Gui CONDITION ANDROID
 #### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl:
 # MODULE_CONFIG = "opengl"
 
-qt_extend_target(Gui CONDITION MACOS
+qt_internal_extend_target(Gui CONDITION MACOS
     SOURCES
         platform/macos/qcocoaplatforminterface.mm
     LIBRARIES
@@ -369,7 +369,7 @@ qt_extend_target(Gui CONDITION MACOS
         ${FWAppKit}
 )
 
-qt_extend_target(Gui CONDITION APPLE
+qt_internal_extend_target(Gui CONDITION APPLE
     SOURCES
         image/qimage_darwin.mm
         painting/qcoregraphics.mm painting/qcoregraphics_p.h
@@ -386,12 +386,12 @@ qt_extend_target(Gui CONDITION APPLE
         ${FWImageIO}
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_animation
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_animation
     SOURCES
         animation/qguivariantanimation.cpp
 )
 
-qt_extend_target(Gui CONDITION WIN32
+qt_internal_extend_target(Gui CONDITION WIN32
     SOURCES
         image/qpixmap_win.cpp
         kernel/qwindowdefs_win.h
@@ -425,7 +425,7 @@ if(QT_FEATURE_egl)
 endif()
 # special case end
 
-qt_extend_target(Gui CONDITION QT_FEATURE_egl
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl
     SOURCES
         opengl/platform/egl/qeglconvenience.cpp opengl/platform/egl/qeglconvenience_p.h
         opengl/platform/egl/qeglstreamconvenience.cpp opengl/platform/egl/qeglstreamconvenience_p.h
@@ -471,7 +471,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_egl
 #### Keys ignored in scope 18:.:.:gui.pro:APPLE:
 # CMAKE_GL_HEADER_NAME = "gl.h"
 
-qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility
     SOURCES
         accessible/qaccessible.cpp accessible/qaccessible.h
         accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h
@@ -482,14 +482,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
         accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h
 )
 
-qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
+qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
     SOURCES
         accessible/qaccessiblecache_mac.mm
     LIBRARIES
         ${FWFoundation}
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32
     SOURCES
         accessible/windows/apisupport/qwindowsuiawrapper.cpp accessible/windows/apisupport/qwindowsuiawrapper_p.h
         accessible/windows/apisupport/uiaattributeids_p.h
@@ -504,7 +504,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32
         accessible/windows/apisupport/uiatypes_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge
     SOURCES
         accessible/linux/atspiadaptor.cpp accessible/linux/atspiadaptor_p.h
         accessible/linux/dbusconnection.cpp accessible/linux/dbusconnection_p.h
@@ -529,13 +529,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibi
         PkgConfig::ATSPI2_nolink
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_action
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_action
     SOURCES
         kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
         kernel/qactiongroup.cpp kernel/qactiongroup.h kernel/qactiongroup_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_draganddrop
     SOURCES
         kernel/qdnd.cpp kernel/qdnd_p.h
         kernel/qdrag.cpp kernel/qdrag.h
@@ -544,19 +544,19 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
         kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_shortcut
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_shortcut
     SOURCES
         kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
         kernel/qshortcut.cpp kernel/qshortcut.h kernel/qshortcut_p.h
         kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_movie
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_movie
     SOURCES
         image/qmovie.cpp image/qmovie.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_png
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_png
     SOURCES
         image/qpnghandler.cpp image/qpnghandler_p.h
     LIBRARIES
@@ -566,69 +566,69 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png
 #### Keys ignored in scope 40:.: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)
+qt_internal_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0)
     COMPILE_OPTIONS
         -fno-reorder-blocks-and-partition
 )
 
 if(NOT ANDROID)
-    qt_add_simd_part(Gui SIMD sse2
+    qt_internal_add_simd_part(Gui SIMD sse2
         SOURCES
             painting/qdrawhelper_sse2.cpp
     )
 
-    qt_add_simd_part(Gui SIMD ssse3
+    qt_internal_add_simd_part(Gui SIMD ssse3
         SOURCES
             image/qimage_ssse3.cpp
             painting/qdrawhelper_ssse3.cpp
     )
 
-    qt_add_simd_part(Gui SIMD sse4_1
+    qt_internal_add_simd_part(Gui SIMD sse4_1
         SOURCES
             painting/qdrawhelper_sse4.cpp
             painting/qimagescale_sse4.cpp
     )
 
-    qt_add_simd_part(Gui SIMD neon
+    qt_internal_add_simd_part(Gui SIMD neon
         SOURCES
             image/qimage_neon.cpp
             painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
             painting/qimagescale_neon.cpp
     )
 
-    qt_add_simd_part(Gui SIMD mips_dsp
+    qt_internal_add_simd_part(Gui SIMD mips_dsp
         SOURCES
             painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
             painting/qdrawhelper_mips_dsp_asm.S
             painting/qt_mips_asm_dsp_p.h
     )
 
-    qt_add_simd_part(Gui SIMD mips_dspr2
+    qt_internal_add_simd_part(Gui SIMD mips_dspr2
         SOURCES
             image/qimage_mips_dspr2.cpp
             image/qimage_mips_dspr2_asm.S
             painting/qdrawhelper_mips_dspr2_asm.S
     )
 
-    qt_add_simd_part(Gui SIMD arch_haswell
+    qt_internal_add_simd_part(Gui SIMD arch_haswell
         SOURCES
             painting/qdrawhelper_avx2.cpp
     )
 endif()
 
-qt_extend_target(Gui CONDITION ANDROID
+qt_internal_extend_target(Gui CONDITION ANDROID
     SOURCES
         platform/android/qandroidplatforminterface.cpp
 )
 
-qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL arm64 OR TEST_architecture_arch STREQUAL arm) # special case
+qt_internal_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL arm64 OR TEST_architecture_arch STREQUAL arm) # special case
     SOURCES
         image/qimage_neon.cpp
         painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
         painting/qimagescale_neon.cpp
 )
 
-qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64)
+qt_internal_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64)
     SOURCES
         image/qimage_ssse3.cpp
         painting/qdrawhelper_sse2.cpp
@@ -648,7 +648,7 @@ if (MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 8.1.0)
 endif()
 # special case end
 
-qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_harfbuzz
     SOURCES
         text/qharfbuzzng.cpp text/qharfbuzzng_p.h
     LIBRARIES
@@ -659,13 +659,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz
 # Replicate what src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro does, which is link CoreText
 # when targeting uikit.
 
-qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz AND UIKIT
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_harfbuzz AND UIKIT
     LIBRARIES
         ${FWCoreText}
 )
 # special case end
 
-qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_textodfwriter
     SOURCES
         text/qtextodfwriter.cpp text/qtextodfwriter_p.h
         text/qzip.cpp
@@ -673,17 +673,17 @@ qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter
         text/qzipwriter_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader
     SOURCES
         text/qtextmarkdownimporter.cpp text/qtextmarkdownimporter_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader
     LIBRARIES
         libmd4c
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader
     SOURCES
         ../3rdparty/md4c/md4c.c ../3rdparty/md4c/md4c.h
     DEFINES
@@ -692,18 +692,18 @@ qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_
         ../3rdparty/md4c
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter
     SOURCES
         text/qtextmarkdownwriter.cpp text/qtextmarkdownwriter_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_cssparser
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_cssparser
     SOURCES
         painting/qcssutil.cpp
         text/qcssparser.cpp text/qcssparser_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_freetype
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype
     SOURCES
         text/freetype/qfontengine_ft.cpp text/freetype/qfontengine_ft_p.h
         text/freetype/qfreetypefontdatabase.cpp text/freetype/qfreetypefontdatabase_p.h
@@ -711,12 +711,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_freetype
         WrapFreetype::WrapFreetype
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE
     SOURCES
         text/unix/qgenericunixfontdatabase_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE
     SOURCES
         text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h
         text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h
@@ -724,61 +724,61 @@ qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND
         Fontconfig::Fontconfig
 )
 
-qt_extend_target(Gui CONDITION APPLE AND NOT MACOS
+qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
     LIBRARIES
         ${FWUIKit}
 )
 
-qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_freetype
+qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_freetype
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND WIN32
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype AND WIN32
     SOURCES
         text/windows/qwindowsfontdatabase_ft.cpp text/windows/qwindowsfontdatabase_ft_p.h
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32
     SOURCES
         text/windows/qwindowsfontenginedirectwrite.cpp text/windows/qwindowsfontenginedirectwrite_p.h
     LIBRARIES
         d2d1
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32
     SOURCES
         text/windows/qwindowsdirectwritefontdatabase.cpp text/windows/qwindowsdirectwritefontdatabase_p.h
     LIBRARIES
         dwrite # special case
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite3
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite3
     LIBRARIES
         dwrite # special case
 )
 
-qt_extend_target(Gui CONDITION MINGW AND WIN32
+qt_internal_extend_target(Gui CONDITION MINGW AND WIN32
     LIBRARIES
         uuid
 )
 
-qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT
+qt_internal_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT
     DEFINES
         ENABLE_PIXMAN_DRAWHELPERS
 )
 
 if(UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT)
-    qt_add_simd_part(Gui SIMD neon
+    qt_internal_add_simd_part(Gui SIMD neon
         SOURCES
             ../3rdparty/pixman/pixman-arm-neon-asm.S
             painting/qdrawhelper_neon_asm.S
     )
 endif()
 
-qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64
+qt_internal_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64
     SOURCES
         painting/qdrawhelper_sse4.cpp
         painting/qimagescale_sse4.cpp
@@ -787,78 +787,78 @@ qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_6
         QT_COMPILER_SUPPORTS_SSE4_2
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib
     INCLUDE_DIRECTORIES
         ../3rdparty/zlib/src
 )
 
-qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
     LIBRARIES
         Qt::Core
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_regularexpression
     SOURCES
         util/qshadergenerator.cpp util/qshadergenerator_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_undocommand
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_undocommand
     SOURCES
         util/qundostack.cpp util/qundostack.h util/qundostack_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup
     SOURCES
         util/qundogroup.cpp util/qundogroup.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h
     LIBRARIES
         X11::X11
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_opengl
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_opengl
     SOURCES
         opengl/platform/egl/qeglpbuffer.cpp opengl/platform/egl/qeglpbuffer_p.h
         opengl/platform/egl/qeglplatformcontext.cpp opengl/platform/egl/qeglplatformcontext_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_egl_x11
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_egl_x11
     SOURCES
         opengl/platform/egl/qxlibeglintegration.cpp opengl/platform/egl/qxlibeglintegration_p.h
     LIBRARIES
         X11::X11
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11
     DEFINES
         QT_EGL_NO_X11
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_dlopen AND QT_FEATURE_egl
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_dlopen AND QT_FEATURE_egl
     LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
     SOURCES
         itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_filesystemmodel
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_filesystemmodel
     SOURCES
         itemmodels/qfileinfogatherer.cpp itemmodels/qfileinfogatherer_p.h
         itemmodels/qfilesystemmodel.cpp itemmodels/qfilesystemmodel.h itemmodels/qfilesystemmodel_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_vulkan
     SOURCES
         rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
         rhi/qrhivulkan_p_p.h
@@ -901,7 +901,7 @@ if (QT_FEATURE_vulkan)
         COMMENT "Generating vulkan data"
     )
 
-    extend_target(Gui
+    qt_internal_extend_target(Gui
         SOURCES
             "${CMAKE_CURRENT_BINARY_DIR}/vulkan/${vulkan_fun}"
             "${CMAKE_CURRENT_BINARY_DIR}/vulkan/${vulkan_fun_p}"
@@ -942,12 +942,12 @@ add_custom_command(
 #### Keys ignored in scope 113:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
-qt_extend_target(Gui CONDITION WASM
+qt_internal_extend_target(Gui CONDITION WASM
     SOURCES
         platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h
 )
 
-qt_extend_target(Gui CONDITION UNIX
+qt_internal_extend_target(Gui CONDITION UNIX
     SOURCES
         platform/unix/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h
         platform/unix/qunixeventdispatcher.cpp
@@ -955,29 +955,29 @@ qt_extend_target(Gui CONDITION UNIX
         platform/unix/qunixplatforminterface.cpp
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
     SOURCES
         platform/unix/qeventdispatcher_glib.cpp platform/unix/qeventdispatcher_glib_p.h
     LIBRARIES
         GLIB2::GLIB2
 )
 
-qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         platform/unix/qgenericunixservices.cpp platform/unix/qgenericunixservices_p.h
 )
 
-qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
     LIBRARIES
         Qt::DBus
 )
 
-qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         platform/unix/qgenericunixthemes.cpp platform/unix/qgenericunixthemes_p.h
 )
 
-qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         platform/unix/dbusmenu/qdbusmenuadaptor.cpp platform/unix/dbusmenu/qdbusmenuadaptor_p.h
         platform/unix/dbusmenu/qdbusmenubar.cpp platform/unix/dbusmenu/qdbusmenubar_p.h
@@ -987,7 +987,7 @@ qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR N
         platform/unix/dbusmenu/qdbusplatformmenu.cpp platform/unix/dbusmenu/qdbusplatformmenu_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT MACOS) AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         platform/unix/dbustray/qdbustrayicon.cpp platform/unix/dbustray/qdbustrayicon_p.h
         platform/unix/dbustray/qdbustraytypes.cpp platform/unix/dbustray/qdbustraytypes_p.h
@@ -995,7 +995,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::DBus AND
         platform/unix/dbustray/qxdgnotificationproxy.cpp platform/unix/dbustray/qxdgnotificationproxy_p.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
     SOURCES
         platform/unix/qxkbcommon.cpp platform/unix/qxkbcommon_p.h
         platform/unix/qxkbcommon_3rdparty.cpp
@@ -1003,7 +1003,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
         XKB::XKB
 )
 
-qt_extend_target(Gui CONDITION IOS OR MACOS
+qt_internal_extend_target(Gui CONDITION IOS OR MACOS
     SOURCES
         rhi/qrhimetal.mm rhi/qrhimetal_p.h
         rhi/qrhimetal_p_p.h
@@ -1011,7 +1011,7 @@ qt_extend_target(Gui CONDITION IOS OR MACOS
         ${FWMetal}
 )
 
-qt_extend_target(Gui # special case CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 # source subtraction gone wrong
+qt_internal_extend_target(Gui # special case CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 # source subtraction gone wrong
     SOURCES
         painting/qdrawhelper.cpp
     NO_PCH_SOURCES
@@ -1019,8 +1019,8 @@ qt_extend_target(Gui # special case CONDITION NOT GCC OR NOT QT_COMPILER_VERSION
 )
 
 
-qt_create_tracepoints(Gui qtgui.tracepoints)
-qt_add_docs(Gui
+qt_internal_create_tracepoints(Gui qtgui.tracepoints)
+qt_internal_add_docs(Gui
     doc/qtgui.qdocconf
 )
 
diff --git a/src/gui/accessible/linux/.prev_CMakeLists.txt b/src/gui/accessible/linux/.prev_CMakeLists.txt
deleted file mode 100644
index ffb0ca9610..0000000000
--- a/src/gui/accessible/linux/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# Generated from linuxaccessibility.pro.
-
-#####################################################################
-## LinuxAccessibilitySupport Module:
-#####################################################################
-
-qt_add_module(LinuxAccessibilitySupport
-    STATIC
-    INTERNAL_MODULE
-    SOURCES
-        application.cpp application_p.h
-        atspiadaptor.cpp atspiadaptor_p.h
-        bridge.cpp bridge_p.h
-        cache.cpp cache_p.h
-        constant_mappings.cpp constant_mappings_p.h
-        dbusconnection.cpp dbusconnection_p.h
-        struct_marshallers.cpp struct_marshallers_p.h
-    DBUS_ADAPTOR_SOURCES
-        dbusxml/Cache.xml
-        dbusxml/DeviceEventController.xml
-    DBUS_ADAPTOR_FLAGS
-        "-i" "struct_marshallers_p.h"
-    DBUS_INTERFACE_SOURCES
-        dbusxml/Bus.xml
-        dbusxml/Socket.xml
-    DBUS_INTERFACE_FLAGS
-        "-i" "struct_marshallers_p.h"
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-    PUBLIC_LIBRARIES
-        PkgConfig::ATSPI2_nolink
-        Qt::CorePrivate
-        Qt::DBus
-        Qt::GuiPrivate
-    PRECOMPILED_HEADER
-        "../../corelib/global/qt_pch.h"
-)
-
-#### Keys ignored in scope 1:.:.:linuxaccessibility.pro:<TRUE>:
-# MODULE = "linuxaccessibility_support"
diff --git a/src/gui/accessible/linux/CMakeLists.txt b/src/gui/accessible/linux/CMakeLists.txt
deleted file mode 100644
index 0e1a7a9d16..0000000000
--- a/src/gui/accessible/linux/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated from linuxaccessibility.pro.
-
-qt_find_package(ATSPI2) # special case
-
-#####################################################################
-## LinuxAccessibilitySupport Module:
-#####################################################################
-
-qt_add_module(LinuxAccessibilitySupport
-    STATIC
-    INTERNAL_MODULE
-    SOURCES
-        application.cpp application_p.h
-        atspiadaptor.cpp atspiadaptor_p.h
-        bridge.cpp bridge_p.h
-        cache.cpp cache_p.h
-        constant_mappings.cpp constant_mappings_p.h
-        dbusconnection.cpp dbusconnection_p.h
-        struct_marshallers.cpp struct_marshallers_p.h
-    DBUS_ADAPTOR_SOURCES
-        dbusxml/Cache.xml
-        dbusxml/DeviceEventController.xml
-    DBUS_ADAPTOR_FLAGS
-        "-i" "struct_marshallers_p.h"
-    DBUS_INTERFACE_SOURCES
-        dbusxml/Bus.xml
-        dbusxml/Socket.xml
-    DBUS_INTERFACE_FLAGS
-        "-i" "struct_marshallers_p.h"
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-    PUBLIC_LIBRARIES
-        PkgConfig::ATSPI2_nolink
-        Qt::CorePrivate
-        Qt::DBus
-        Qt::GuiPrivate
-    PRECOMPILED_HEADER
-        "../../corelib/global/qt_pch.h"
-)
-
-#### Keys ignored in scope 1:.:.:linuxaccessibility.pro:<TRUE>:
-# MODULE = "linuxaccessibility_support"
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
index 623ea27e26..a9da13bd31 100644
--- a/src/network/.prev_CMakeLists.txt
+++ b/src/network/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Network Module:
 #####################################################################
 
-qt_add_module(Network
+qt_internal_add_module(Network
     PLUGIN_TYPES networkaccessbackends
     SOURCES
         access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
@@ -67,35 +67,35 @@ qt_add_module(Network
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x64000000"
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_networkdiskcache
+qt_internal_extend_target(Network CONDITION QT_FEATURE_networkdiskcache
     SOURCES
         access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_settings
+qt_internal_extend_target(Network CONDITION QT_FEATURE_settings
     SOURCES
         access/qhstsstore.cpp access/qhstsstore_p.h
 )
 
-qt_extend_target(Network CONDITION APPLE
+qt_internal_extend_target(Network CONDITION APPLE
     LIBRARIES
         ${FWCoreFoundation}
         ${FWSecurity}
 )
 
-qt_extend_target(Network CONDITION WASM
+qt_internal_extend_target(Network CONDITION WASM
     SOURCES
         access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h
         access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h
         access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_http
+qt_internal_extend_target(Network CONDITION QT_FEATURE_http
     SOURCES
         access/http2/bitstreams.cpp access/http2/bitstreams_p.h
         access/http2/hpack.cpp access/http2/hpack_p.h
@@ -120,70 +120,70 @@ qt_extend_target(Network CONDITION QT_FEATURE_http
         socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_brotli AND QT_FEATURE_http
+qt_internal_extend_target(Network CONDITION QT_FEATURE_brotli AND QT_FEATURE_http
     LIBRARIES
         WrapBrotli::WrapBrotliDec
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_zstd
+qt_internal_extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_zstd
     LIBRARIES
         ZSTD::ZSTD
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(Network CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib
     INCLUDE_DIRECTORIES
         ../3rdparty/zlib/src
 )
 
-qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
     LIBRARIES
         Qt::Core
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_topleveldomain
+qt_internal_extend_target(Network CONDITION QT_FEATURE_topleveldomain
     SOURCES
         kernel/qtldurl.cpp kernel/qtldurl_p.h
         kernel/qurltlds_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dnslookup
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup
     SOURCES
         kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
 )
 
-qt_extend_target(Network CONDITION UNIX
+qt_internal_extend_target(Network CONDITION UNIX
     SOURCES
         kernel/qhostinfo_unix.cpp
         socket/qnativesocketengine_unix.cpp
         socket/qnet_unix_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
     LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
+qt_internal_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
     SOURCES
         kernel/qnetworkinterface_linux.cpp
 )
 
-qt_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink
+qt_internal_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink
     SOURCES
         kernel/qnetworkinterface_unix.cpp
 )
 
-qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
+qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
     SOURCES
         kernel/qdnslookup_android.cpp
 )
 
-qt_extend_target(Network CONDITION WIN32
+qt_internal_extend_target(Network CONDITION WIN32
     SOURCES
         kernel/qhostinfo_win.cpp
         kernel/qnetworkinterface_win.cpp
@@ -195,50 +195,50 @@ qt_extend_target(Network CONDITION WIN32
         iphlpapi
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
     SOURCES
         kernel/qdnslookup_win.cpp
 )
 
-qt_extend_target(Network CONDITION APPLE AND NOT UIKIT
+qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT
     LIBRARIES
         ${FWCoreServices}
         ${FWSystemConfiguration}
 )
 
-qt_extend_target(Network CONDITION IOS OR MACOS
+qt_internal_extend_target(Network CONDITION IOS OR MACOS
     SOURCES
         kernel/qnetconmonitor_darwin.mm
     LIBRARIES
         ${FWSystemConfiguration}
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS
+qt_internal_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS
     SOURCES
         kernel/qnetconmonitor_win.cpp
 )
 
-qt_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr
+qt_internal_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr
     SOURCES
         kernel/qnetconmonitor_stub.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_gssapi
+qt_internal_extend_target(Network CONDITION QT_FEATURE_gssapi
     LIBRARIES
         GSSAPI::GSSAPI
 )
 
-qt_extend_target(Network CONDITION UIKIT
+qt_internal_extend_target(Network CONDITION UIKIT
     SOURCES
         kernel/qnetworkinterface_uikit_p.h
 )
 
-qt_extend_target(Network CONDITION MACOS
+qt_internal_extend_target(Network CONDITION MACOS
     SOURCES
         kernel/qnetworkproxy_mac.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS
+qt_internal_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS
     SOURCES
         kernel/qnetworkproxy_libproxy.cpp
     LIBRARIES
@@ -246,12 +246,12 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS
         PkgConfig::Libproxy
 )
 
-qt_extend_target(Network CONDITION ANDROID AND NOT QT_FEATURE_libproxy
+qt_internal_extend_target(Network CONDITION ANDROID AND NOT QT_FEATURE_libproxy
     SOURCES
         kernel/qnetworkproxy_android.cpp
 )
 
-qt_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy
+qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy
     SOURCES
         kernel/qnetworkproxy_generic.cpp
 )
@@ -262,29 +262,29 @@ if(ANDROID AND (ANDROID))
     )
 endif()
 
-qt_extend_target(Network CONDITION QT_FEATURE_socks5
+qt_internal_extend_target(Network CONDITION QT_FEATURE_socks5
     SOURCES
         socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_sctp
+qt_internal_extend_target(Network CONDITION QT_FEATURE_sctp
     SOURCES
         socket/qsctpserver.cpp socket/qsctpserver.h socket/qsctpserver_p.h
         socket/qsctpsocket.cpp socket/qsctpsocket.h socket/qsctpsocket_p.h
 )
 
-qt_extend_target(Network CONDITION MSVC
+qt_internal_extend_target(Network CONDITION MSVC
     MOC_OPTIONS
         "-D_WINSOCK_DEPRECATED_NO_WARNINGS"
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_localserver
+qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver
     SOURCES
         socket/qlocalserver.cpp socket/qlocalserver.h socket/qlocalserver_p.h
         socket/qlocalsocket.cpp socket/qlocalsocket.h socket/qlocalsocket_p.h
 )
 
-qt_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver
+qt_internal_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver
     SOURCES
         socket/qlocalserver_tcp.cpp
         socket/qlocalsocket_tcp.cpp
@@ -292,29 +292,29 @@ qt_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver
         QT_LOCALSOCKET_TCP
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY
+qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY
     SOURCES
         socket/qlocalserver_unix.cpp
         socket/qlocalsocket_unix.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32
+qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32
     SOURCES
         socket/qlocalserver_win.cpp
         socket/qlocalsocket_win.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_system_proxies
+qt_internal_extend_target(Network CONDITION QT_FEATURE_system_proxies
     DEFINES
         QT_USE_SYSTEM_PROXIES
 )
 
-qt_extend_target(Network CONDITION NOT QT_FEATURE_openssl
+qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_openssl
     SOURCES
         ssl/qsslcertificate_qt.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_ssl
     SOURCES
         ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h
         ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h
@@ -327,7 +327,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_ssl
         ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
     SOURCES
         ssl/qsslcertificate_schannel.cpp
         ssl/qssldiffiehellmanparameters_dummy.cpp
@@ -343,7 +343,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
         ncrypt
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
     SOURCES
         ssl/qssldiffiehellmanparameters_dummy.cpp
         ssl/qsslellipticcurve_dummy.cpp
@@ -354,12 +354,12 @@ qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
         ssl/qsslsocket_qt.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl
     SOURCES
         ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
     SOURCES
         ssl/qsslcertificate_openssl.cpp
         ssl/qsslcontext_openssl.cpp ssl/qsslcontext_openssl_p.h
@@ -372,54 +372,54 @@ qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
         OPENSSL_API_COMPAT=0x10100000L
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
     SOURCES
         ssl/qdtls_openssl.cpp ssl/qdtls_openssl_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl
     SOURCES
         ssl/qocsp_p.h
 )
 
-qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
     SOURCES
         ssl/qsslsocket_mac_shared.cpp
 )
 
-qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED
+qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED
     SOURCES
         ssl/qsslsocket_openssl_android.cpp
 )
 
-qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi)
+qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi)
     LIBRARIES
         crypto_${CMAKE_SYSTEM_PROCESSOR}
         ssl_${CMAKE_SYSTEM_PROCESSOR}
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
+qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
     LIBRARIES
         WrapOpenSSL::WrapOpenSSL
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
+qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
     LIBRARIES
         WrapOpenSSLHeaders::WrapOpenSSLHeaders
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
+qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
     SOURCES
         ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h
     LIBRARIES
         crypt32
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY
     SOURCES
         kernel/qdnslookup_unix.cpp
 )
-qt_add_docs(Network
+qt_internal_add_docs(Network
     doc/qtnetwork.qdocconf
 )
 
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index d19457e0e0..d94fff5f7f 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Network Module:
 #####################################################################
 
-qt_add_module(Network
+qt_internal_add_module(Network
     PLUGIN_TYPES networkaccessbackends
     SOURCES
         access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
@@ -67,35 +67,35 @@ qt_add_module(Network
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x64000000"
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_networkdiskcache
+qt_internal_extend_target(Network CONDITION QT_FEATURE_networkdiskcache
     SOURCES
         access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_settings
+qt_internal_extend_target(Network CONDITION QT_FEATURE_settings
     SOURCES
         access/qhstsstore.cpp access/qhstsstore_p.h
 )
 
-qt_extend_target(Network CONDITION APPLE
+qt_internal_extend_target(Network CONDITION APPLE
     LIBRARIES
         ${FWCoreFoundation}
         ${FWSecurity}
 )
 
-qt_extend_target(Network CONDITION WASM
+qt_internal_extend_target(Network CONDITION WASM
     SOURCES
         access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h
         access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h
         access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_http
+qt_internal_extend_target(Network CONDITION QT_FEATURE_http
     SOURCES
         access/http2/bitstreams.cpp access/http2/bitstreams_p.h
         access/http2/hpack.cpp access/http2/hpack_p.h
@@ -120,70 +120,70 @@ qt_extend_target(Network CONDITION QT_FEATURE_http
         socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_brotli AND QT_FEATURE_http
+qt_internal_extend_target(Network CONDITION QT_FEATURE_brotli AND QT_FEATURE_http
     LIBRARIES
         WrapBrotli::WrapBrotliDec
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_zstd
+qt_internal_extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_zstd
     LIBRARIES
         ZSTD::ZSTD
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(Network CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib
     INCLUDE_DIRECTORIES
         ../3rdparty/zlib/src
 )
 
-qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
     LIBRARIES
         Qt::Core
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_topleveldomain
+qt_internal_extend_target(Network CONDITION QT_FEATURE_topleveldomain
     SOURCES
         kernel/qtldurl.cpp kernel/qtldurl_p.h
         kernel/qurltlds_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dnslookup
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup
     SOURCES
         kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
 )
 
-qt_extend_target(Network CONDITION UNIX
+qt_internal_extend_target(Network CONDITION UNIX
     SOURCES
         kernel/qhostinfo_unix.cpp
         socket/qnativesocketengine_unix.cpp
         socket/qnet_unix_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
     LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
+qt_internal_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
     SOURCES
         kernel/qnetworkinterface_linux.cpp
 )
 
-qt_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink
+qt_internal_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink
     SOURCES
         kernel/qnetworkinterface_unix.cpp
 )
 
-qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
+qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
     SOURCES
         kernel/qdnslookup_android.cpp
 )
 
-qt_extend_target(Network CONDITION WIN32
+qt_internal_extend_target(Network CONDITION WIN32
     SOURCES
         kernel/qhostinfo_win.cpp
         kernel/qnetworkinterface_win.cpp
@@ -195,50 +195,50 @@ qt_extend_target(Network CONDITION WIN32
         iphlpapi
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
     SOURCES
         kernel/qdnslookup_win.cpp
 )
 
-qt_extend_target(Network CONDITION APPLE AND NOT UIKIT
+qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT
     LIBRARIES
         ${FWCoreServices}
         ${FWSystemConfiguration}
 )
 
-qt_extend_target(Network CONDITION IOS OR MACOS
+qt_internal_extend_target(Network CONDITION IOS OR MACOS
     SOURCES
         kernel/qnetconmonitor_darwin.mm
     LIBRARIES
         ${FWSystemConfiguration}
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS
+qt_internal_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS
     SOURCES
         kernel/qnetconmonitor_win.cpp
 )
 
-qt_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr
+qt_internal_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr
     SOURCES
         kernel/qnetconmonitor_stub.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_gssapi
+qt_internal_extend_target(Network CONDITION QT_FEATURE_gssapi
     LIBRARIES
         GSSAPI::GSSAPI
 )
 
-qt_extend_target(Network CONDITION UIKIT
+qt_internal_extend_target(Network CONDITION UIKIT
     SOURCES
         kernel/qnetworkinterface_uikit_p.h
 )
 
-qt_extend_target(Network CONDITION MACOS
+qt_internal_extend_target(Network CONDITION MACOS
     SOURCES
         kernel/qnetworkproxy_mac.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS
+qt_internal_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS
     SOURCES
         kernel/qnetworkproxy_libproxy.cpp
     LIBRARIES
@@ -246,12 +246,12 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS
         PkgConfig::Libproxy
 )
 
-qt_extend_target(Network CONDITION ANDROID
+qt_internal_extend_target(Network CONDITION ANDROID # special case
     SOURCES
         kernel/qnetworkproxy_android.cpp
 )
 
-qt_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
+qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) # special case
     SOURCES
         kernel/qnetworkproxy_generic.cpp
 )
@@ -262,29 +262,29 @@ if(ANDROID AND (ANDROID))
     )
 endif()
 
-qt_extend_target(Network CONDITION QT_FEATURE_socks5
+qt_internal_extend_target(Network CONDITION QT_FEATURE_socks5
     SOURCES
         socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_sctp
+qt_internal_extend_target(Network CONDITION QT_FEATURE_sctp
     SOURCES
         socket/qsctpserver.cpp socket/qsctpserver.h socket/qsctpserver_p.h
         socket/qsctpsocket.cpp socket/qsctpsocket.h socket/qsctpsocket_p.h
 )
 
-qt_extend_target(Network CONDITION MSVC
+qt_internal_extend_target(Network CONDITION MSVC
     MOC_OPTIONS
         "-D_WINSOCK_DEPRECATED_NO_WARNINGS"
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_localserver
+qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver
     SOURCES
         socket/qlocalserver.cpp socket/qlocalserver.h socket/qlocalserver_p.h
         socket/qlocalsocket.cpp socket/qlocalsocket.h socket/qlocalsocket_p.h
 )
 
-qt_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver
+qt_internal_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver
     SOURCES
         socket/qlocalserver_tcp.cpp
         socket/qlocalsocket_tcp.cpp
@@ -292,29 +292,29 @@ qt_extend_target(Network CONDITION INTEGRITY AND QT_FEATURE_localserver
         QT_LOCALSOCKET_TCP
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY
+qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY
     SOURCES
         socket/qlocalserver_unix.cpp
         socket/qlocalsocket_unix.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32
+qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32
     SOURCES
         socket/qlocalserver_win.cpp
         socket/qlocalsocket_win.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_system_proxies
+qt_internal_extend_target(Network CONDITION QT_FEATURE_system_proxies
     DEFINES
         QT_USE_SYSTEM_PROXIES
 )
 
-qt_extend_target(Network CONDITION NOT QT_FEATURE_openssl
+qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_openssl
     SOURCES
         ssl/qsslcertificate_qt.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_ssl
     SOURCES
         ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h
         ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h
@@ -327,7 +327,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_ssl
         ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
     SOURCES
         ssl/qsslcertificate_schannel.cpp
         ssl/qssldiffiehellmanparameters_dummy.cpp
@@ -343,7 +343,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
         ncrypt
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
     SOURCES
         ssl/qssldiffiehellmanparameters_dummy.cpp
         ssl/qsslellipticcurve_dummy.cpp
@@ -354,12 +354,12 @@ qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
         ssl/qsslsocket_qt.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl
     SOURCES
         ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
     SOURCES
         ssl/qsslcertificate_openssl.cpp
         ssl/qsslcontext_openssl.cpp ssl/qsslcontext_openssl_p.h
@@ -372,57 +372,57 @@ qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
         OPENSSL_API_COMPAT=0x10100000L
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
     SOURCES
         ssl/qdtls_openssl.cpp ssl/qdtls_openssl_p.h
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl
     SOURCES
         ssl/qocsp_p.h
 )
 
-qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+qt_internal_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
     SOURCES
         ssl/qsslsocket_mac_shared.cpp
 )
 
-qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED
+qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED
     SOURCES
         ssl/qsslsocket_openssl_android.cpp
 )
 
-qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi)
+qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi)
     LIBRARIES
         crypto_${CMAKE_SYSTEM_PROCESSOR}
         ssl_${CMAKE_SYSTEM_PROCESSOR}
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
+qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
     LIBRARIES
         WrapOpenSSL::WrapOpenSSL
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
+qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
     LIBRARIES
         WrapOpenSSLHeaders::WrapOpenSSLHeaders
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
+qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
     SOURCES
         ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h
     LIBRARIES
         crypt32
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY
     SOURCES
         kernel/qdnslookup_unix.cpp
 )
-qt_add_docs(Network
+qt_internal_add_docs(Network
     doc/qtnetwork.qdocconf
 )
 
-qt_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf
+qt_internal_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf
 
-qt_extend_target(Network CONDITION QNX PUBLIC_LIBRARIES socket) # special case: mkspecs/common/qcc-base-qnx.conf
+qt_internal_extend_target(Network CONDITION QNX PUBLIC_LIBRARIES socket) # special case: mkspecs/common/qcc-base-qnx.conf
diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt
index 1d8544ab8e..a6e2e56561 100644
--- a/src/opengl/.prev_CMakeLists.txt
+++ b/src/opengl/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## OpenGL Module:
 #####################################################################
 
-qt_add_module(OpenGL
+qt_internal_add_module(OpenGL
     SOURCES
         qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
         qopenglbuffer.cpp qopenglbuffer.h
@@ -49,12 +49,12 @@ qt_add_module(OpenGL
 ## Scopes:
 #####################################################################
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
     SOURCES
         qopenglfunctions_es2.cpp qopenglfunctions_es2.h
 )
 
-qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
+qt_internal_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
     SOURCES
         qopenglfunctions_1_0.cpp qopenglfunctions_1_0.h
         qopenglfunctions_1_1.cpp qopenglfunctions_1_1.h
@@ -86,22 +86,22 @@ qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
         qopengltimerquery.cpp qopengltimerquery.h
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
     SOURCES
         qvkconvenience.cpp qvkconvenience_p.h
     PUBLIC_LIBRARIES
         Vulkan::Vulkan_nolink
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_egl
     SOURCES
         qopenglcompositor.cpp qopenglcompositor_p.h
         qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )
 
 
-qt_create_tracepoints(OpenGL qtopengl.tracepoints)
-qt_add_docs(OpenGL
+qt_internal_create_tracepoints(OpenGL qtopengl.tracepoints)
+qt_internal_add_docs(OpenGL
     doc/qtopengl.qdocconf
 )
 
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 781301dc0f..a6e2e56561 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## OpenGL Module:
 #####################################################################
 
-qt_add_module(OpenGL
+qt_internal_add_module(OpenGL
     SOURCES
         qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
         qopenglbuffer.cpp qopenglbuffer.h
@@ -49,12 +49,12 @@ qt_add_module(OpenGL
 ## Scopes:
 #####################################################################
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
     SOURCES
         qopenglfunctions_es2.cpp qopenglfunctions_es2.h
 )
 
-qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
+qt_internal_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
     SOURCES
         qopenglfunctions_1_0.cpp qopenglfunctions_1_0.h
         qopenglfunctions_1_1.cpp qopenglfunctions_1_1.h
@@ -86,21 +86,22 @@ qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
         qopengltimerquery.cpp qopengltimerquery.h
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
     SOURCES
         qvkconvenience.cpp qvkconvenience_p.h
     PUBLIC_LIBRARIES
         Vulkan::Vulkan_nolink
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_egl
     SOURCES
         qopenglcompositor.cpp qopenglcompositor_p.h
         qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )
 
-qt_create_tracepoints(OpenGL qtopengl.tracepoints)
-qt_add_docs(OpenGL
+
+qt_internal_create_tracepoints(OpenGL qtopengl.tracepoints)
+qt_internal_add_docs(OpenGL
     doc/qtopengl.qdocconf
 )
 
diff --git a/src/openglwidgets/CMakeLists.txt b/src/openglwidgets/CMakeLists.txt
index d58944e596..2a34171cca 100644
--- a/src/openglwidgets/CMakeLists.txt
+++ b/src/openglwidgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## OpenGLWidgets Module:
 #####################################################################
 
-qt_add_module(OpenGLWidgets
+qt_internal_add_module(OpenGLWidgets
     SOURCES
         qopenglwidget.cpp qopenglwidget.h
     DEFINES
diff --git a/src/platformsupport/devicediscovery/.prev_CMakeLists.txt b/src/platformsupport/devicediscovery/.prev_CMakeLists.txt
index 8ecabb4a1b..dcbc74363b 100644
--- a/src/platformsupport/devicediscovery/.prev_CMakeLists.txt
+++ b/src/platformsupport/devicediscovery/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## DeviceDiscoverySupport Module:
 #####################################################################
 
-qt_add_module(DeviceDiscoverySupport
+qt_internal_add_module(DeviceDiscoverySupport
     STATIC
     INTERNAL_MODULE
     SOURCES
@@ -22,19 +22,19 @@ qt_add_module(DeviceDiscoverySupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev
+qt_internal_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
+qt_internal_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
+qt_internal_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/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt
index 171db55f5b..5eede39e68 100644
--- a/src/platformsupport/devicediscovery/CMakeLists.txt
+++ b/src/platformsupport/devicediscovery/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## DeviceDiscoverySupport Module:
 #####################################################################
 
-qt_add_module(DeviceDiscoverySupport
+qt_internal_add_module(DeviceDiscoverySupport
     CONFIG_MODULE_NAME devicediscovery_support # special case
     STATIC
     INTERNAL_MODULE
@@ -23,19 +23,19 @@ qt_add_module(DeviceDiscoverySupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev
+qt_internal_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
+qt_internal_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
+qt_internal_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/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt
index 804b2c15ec..c310cb1faa 100644
--- a/src/platformsupport/fbconvenience/CMakeLists.txt
+++ b/src/platformsupport/fbconvenience/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## FbSupport Module:
 #####################################################################
 
-qt_add_module(FbSupport
+qt_internal_add_module(FbSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt
index b2e9579032..17d3748ea2 100644
--- a/src/platformsupport/input/.prev_CMakeLists.txt
+++ b/src/platformsupport/input/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## InputSupport Module:
 #####################################################################
 
-qt_add_module(InputSupport
+qt_internal_add_module(InputSupport
     STATIC
     INTERNAL_MODULE
     DEFINES
@@ -23,7 +23,7 @@ qt_add_module(InputSupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev
     SOURCES
         evdevkeyboard/qevdevkeyboard_defaultmap_p.h
         evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -36,35 +36,35 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
         evdevtouch/../shared
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
+qt_internal_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
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
     LIBRARIES
         PkgConfig::Libudev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
     LIBRARIES
         PkgConfig::Libudev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
     LIBRARIES
         PkgConfig::Mtdev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_tslib
     SOURCES
         tslib/qtslib.cpp tslib/qtslib_p.h
     PUBLIC_LIBRARIES
         PkgConfig::Tslib
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput
     SOURCES
         libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
         libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
@@ -77,19 +77,19 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
         PkgConfig::Libudev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
     LIBRARIES
         XKB::XKB
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
+qt_internal_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
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
     SOURCES
         integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
     LIBRARIES
diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt
index 5b0c310418..0d6c3a34ae 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:
 #####################################################################
 
-qt_add_module(InputSupport
+qt_internal_add_module(InputSupport
     STATIC
     INTERNAL_MODULE
     DEFINES
@@ -28,7 +28,7 @@ qt_add_module(InputSupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev
     SOURCES
         evdevkeyboard/qevdevkeyboard_defaultmap_p.h
         evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -41,35 +41,35 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
         evdevtouch/../shared
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
+qt_internal_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
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
     LIBRARIES
         PkgConfig::Libudev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
     LIBRARIES
         PkgConfig::Libudev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
     LIBRARIES
         PkgConfig::Mtdev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_tslib
     SOURCES
         tslib/qtslib.cpp tslib/qtslib_p.h
     PUBLIC_LIBRARIES
         PkgConfig::Tslib
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput
     SOURCES
         libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
         libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
@@ -82,19 +82,19 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
         PkgConfig::Libudev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
     LIBRARIES
         XKB::XKB
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
+qt_internal_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
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
+qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
     SOURCES
         integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
     LIBRARIES
diff --git a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
index 5b0fd00566..cc037d9ef5 100644
--- a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## KmsSupport Module:
 #####################################################################
 
-qt_add_module(KmsSupport
+qt_internal_add_module(KmsSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt
index 8001ee27de..d53dcda19f 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:
 #####################################################################
 
-qt_add_module(KmsSupport
+qt_internal_add_module(KmsSupport
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
index 95b3aceff5..bab14249d6 100644
--- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
@@ -23,12 +23,12 @@ qt_internal_add_plugin(QJpegPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg
+qt_internal_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg
     PUBLIC_LIBRARIES
         JPEG::JPEG
 )
 
-qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg
+qt_internal_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg
     SOURCES
         ../../../3rdparty/libjpeg/src/jaricom.c
         ../../../3rdparty/libjpeg/src/jcapimin.c
@@ -88,7 +88,7 @@ qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg
 #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC:
 # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main"
 
-qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg
+qt_internal_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt
index 52c3aa6911..7e69e1aba6 100644
--- a/src/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@@ -25,12 +25,12 @@ qt_internal_add_plugin(QJpegPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg
+qt_internal_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg
     PUBLIC_LIBRARIES
         JPEG::JPEG
 )
 
-qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg
+qt_internal_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg
     SOURCES
         ../../../3rdparty/libjpeg/src/jaricom.c
         ../../../3rdparty/libjpeg/src/jcapimin.c
@@ -98,7 +98,7 @@ endif()
 #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC:
 # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main"
 
-qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg
+qt_internal_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt
index 5b2dada653..7345de1f81 100644
--- a/src/plugins/platforms/android/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/android/.prev_CMakeLists.txt
@@ -60,17 +60,17 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
+qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
     SOURCES
         extract.cpp
 )
 
-qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets
+qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets
     SOURCES
         extract-dummy.cpp
 )
 
-qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
         qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt
index 7fcd42a9bb..2e323325b0 100644
--- a/src/plugins/platforms/android/CMakeLists.txt
+++ b/src/plugins/platforms/android/CMakeLists.txt
@@ -63,17 +63,17 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
+qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
     SOURCES
         extract.cpp
 )
 
-qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets
+qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets
     SOURCES
         extract-dummy.cpp
 )
 
-qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
         qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
index ee40e32033..d42cf811d5 100644
--- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
@@ -67,7 +67,7 @@ set(qcocoaresources_resource_files
     "images/waitcursor.png"
 )
 
-qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
+qt_internal_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
     PREFIX
         "/qt-project.org/mac/cursors"
     FILES
@@ -81,23 +81,23 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qcocoaglcontext.h qcocoaglcontext.mm
 )
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qcocoavulkaninstance.h qcocoavulkaninstance.mm
 )
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
         qcocoaaccessibility.h qcocoaaccessibility.mm
         qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
 )
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
+qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
     SOURCES
         qcocoasessionmanager.cpp qcocoasessionmanager.h
 )
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index 51d7038950..d9832c2c6c 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -77,7 +77,7 @@ set(qcocoaresources_resource_files
     "images/waitcursor.png"
 )
 
-qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
+qt_internal_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
     PREFIX
         "/qt-project.org/mac/cursors"
     FILES
@@ -91,23 +91,23 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qcocoaglcontext.h qcocoaglcontext.mm
 )
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qcocoavulkaninstance.h qcocoavulkaninstance.mm
 )
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
         qcocoaaccessibility.h qcocoaaccessibility.mm
         qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
 )
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
+qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
     SOURCES
         qcocoasessionmanager.cpp qcocoasessionmanager.h
 )
diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
index c6957d57ec..074c9eff3f 100644
--- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
@@ -32,14 +32,14 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl
+qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl
     SOURCES
         qdirectfb_egl.cpp qdirectfb_egl.h
     DEFINES
         DIRECTFB_GL_EGL
 )
 
-qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
     DEFINES
         DIRECTFB_PLATFORM_HOOKS
 )
@@ -47,7 +47,7 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOK
 #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY:
 # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR"
 
-qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
     SOURCES
         qdirectfbeglhooks_stub.cpp
 )
diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt
index 5e4a2f2baa..c66d8bd169 100644
--- a/src/plugins/platforms/directfb/CMakeLists.txt
+++ b/src/plugins/platforms/directfb/CMakeLists.txt
@@ -38,14 +38,14 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl
+qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl
     SOURCES
         qdirectfb_egl.cpp qdirectfb_egl.h
     DEFINES
         DIRECTFB_GL_EGL
 )
 
-qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
     DEFINES
         DIRECTFB_PLATFORM_HOOKS
 )
@@ -53,7 +53,7 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOK
 #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY:
 # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR"
 
-qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
     SOURCES
         qdirectfbeglhooks_stub.cpp
 )
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index 2fbaf4d018..cd1acc22e2 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## EglFSDeviceIntegration Module:
 #####################################################################
 
-qt_add_module(EglFSDeviceIntegration
+qt_internal_add_module(EglFSDeviceIntegration
     INTERNAL_MODULE
     SOURCES
         api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h
@@ -32,12 +32,12 @@ qt_add_module(EglFSDeviceIntegration
 ## Scopes:
 #####################################################################
 
-qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
+qt_internal_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::InputSupportPrivate
 )
 
-qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
     SOURCES
         api/qeglfscontext.cpp api/qeglfscontext_p.h
         api/qeglfscursor.cpp api/qeglfscursor_p.h
@@ -45,12 +45,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
         Qt::OpenGLPrivate
 )
 
-qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
+qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
     DEFINES
         EGLFS_PLATFORM_HOOKS
 )
 
-qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
+qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
     DEFINES
         EGLFS_PREFERRED_PLUGIN=
 )
@@ -62,7 +62,7 @@ if(QT_FEATURE_cursor)
         "cursor.json"
     )
 
-    qt_add_resource(EglFSDeviceIntegration "cursor"
+    qt_internal_add_resource(EglFSDeviceIntegration "cursor"
         PREFIX
             "/"
         FILES
@@ -70,7 +70,7 @@ if(QT_FEATURE_cursor)
     )
 endif()
 
-qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
     SOURCES
         api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
         api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index f74a15f9e6..00b24aa03c 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -5,7 +5,7 @@ qt_find_package(EGL) # special case
 ## EglFSDeviceIntegration Module:
 #####################################################################
 
-qt_add_module(EglFSDeviceIntegration
+qt_internal_add_module(EglFSDeviceIntegration
     INTERNAL_MODULE
     SOURCES
         api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h
@@ -34,12 +34,12 @@ qt_add_module(EglFSDeviceIntegration
 ## Scopes:
 #####################################################################
 
-qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
+qt_internal_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::InputSupportPrivate
 )
 
-qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
     SOURCES
         api/qeglfscontext.cpp api/qeglfscontext_p.h
         api/qeglfscursor.cpp api/qeglfscursor_p.h
@@ -49,12 +49,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
 
 # special case begin
 # comment out
-#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
+#qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
     #DEFINES
         #EGLFS_PLATFORM_HOOKS
 #)
 
-#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
+#qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
     #DEFINES
         #EGLFS_PREFERRED_PLUGIN=
 #)
@@ -67,7 +67,7 @@ if(QT_FEATURE_cursor)
         "cursor.json"
     )
 
-    qt_add_resource(EglFSDeviceIntegration "cursor"
+    qt_internal_add_resource(EglFSDeviceIntegration "cursor"
         PREFIX
             "/"
         FILES
@@ -75,7 +75,7 @@ if(QT_FEATURE_cursor)
     )
 endif()
 
-qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
     SOURCES
         api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
         api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
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 61ae1b932a..61b5470cdf 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@@ -32,7 +32,7 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
 # OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json"
 
 # begin special case
-qt_extend_target(QEglFSKmsEglDeviceIntegrationPlugin
+qt_internal_extend_target(QEglFSKmsEglDeviceIntegrationPlugin
       CONDITION QNX
       COMPILE_OPTIONS -fpermissive
 )
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt
index ec11b355af..3d600c52f1 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## EglFsKmsSupport Module:
 #####################################################################
 
-qt_add_module(EglFsKmsSupport
+qt_internal_add_module(EglFsKmsSupport
     INTERNAL_MODULE
     NO_MODULE_HEADERS
     SOURCES
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
index 0090dbb1ee..d71f1407f8 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## EglFsKmsSupport Module:
 #####################################################################
 
-qt_add_module(EglFsKmsSupport
+qt_internal_add_module(EglFsKmsSupport
     INTERNAL_MODULE
     NO_MODULE_HEADERS
     SOURCES
@@ -28,7 +28,7 @@ qt_add_module(EglFsKmsSupport
 )
 
 # begin special case
-qt_extend_target(EglFsKmsSupport
+qt_internal_extend_target(EglFsKmsSupport
       CONDITION QNX
       COMPILE_OPTIONS -fpermissive
 )
diff --git a/src/plugins/platforms/ios/.prev_CMakeLists.txt b/src/plugins/platforms/ios/.prev_CMakeLists.txt
index 138f323878..2e494c7d23 100644
--- a/src/plugins/platforms/ios/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/ios/.prev_CMakeLists.txt
@@ -42,12 +42,12 @@ qt_internal_add_plugin(QIOSIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
         Qt::OpenGLPrivate
 )
 
-qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
+qt_internal_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
     SOURCES
         qiosclipboard.h qiosclipboard.mm
         qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm
diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt
index 995dcc0a9d..e238cf70fa 100644
--- a/src/plugins/platforms/ios/CMakeLists.txt
+++ b/src/plugins/platforms/ios/CMakeLists.txt
@@ -45,12 +45,12 @@ qt_disable_apple_app_extension_api_only(QIOSIntegrationPlugin)
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
         Qt::OpenGLPrivate
 )
 
-qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
+qt_internal_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
     SOURCES
         qiosclipboard.h qiosclipboard.mm
         qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm
diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
index 258b70603e..920404ec77 100644
--- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
@@ -27,12 +27,12 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
+qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::InputSupportPrivate
 )
 
-qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate
+qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate
     SOURCES
         qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h
     PUBLIC_LIBRARIES
diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt
index ea5642f1c0..d903fdc6a7 100644
--- a/src/plugins/platforms/linuxfb/CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
+qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::InputSupportPrivate
 )
 
-qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate
+qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate
     SOURCES
         qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h
     PUBLIC_LIBRARIES
diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
index bb670b4dd4..b51b64ef99 100644
--- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
@@ -26,7 +26,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
+qt_internal_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt
index bf2e644251..3f6945ed26 100644
--- a/src/plugins/platforms/minimal/CMakeLists.txt
+++ b/src/plugins/platforms/minimal/CMakeLists.txt
@@ -29,7 +29,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
+qt_internal_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
index 15ce608f04..9483f41762 100644
--- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
@@ -27,7 +27,7 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qminimaleglbackingstore.cpp qminimaleglbackingstore.h
     PUBLIC_LIBRARIES
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt
index beb4d54257..1758eb3af0 100644
--- a/src/plugins/platforms/minimalegl/CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/CMakeLists.txt
@@ -30,7 +30,7 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qminimaleglbackingstore.cpp qminimaleglbackingstore.h
     PUBLIC_LIBRARIES
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
index 319502ccc6..aa827366d3 100644
--- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@@ -27,7 +27,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+qt_internal_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
     LIBRARIES
diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt
index 7a312701c6..160aa7df93 100644
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@@ -28,7 +28,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+qt_internal_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
     LIBRARIES
diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
index ab11e57f0d..48e172ed70 100644
--- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
@@ -30,7 +30,7 @@ qt_internal_add_plugin(QVncIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
+qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::InputSupportPrivate
 )
diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt
index 5024459cf4..f3782b5434 100644
--- a/src/plugins/platforms/vnc/CMakeLists.txt
+++ b/src/plugins/platforms/vnc/CMakeLists.txt
@@ -31,7 +31,7 @@ qt_internal_add_plugin(QVncIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
+qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::InputSupportPrivate
 )
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt
index d3e488ed20..cbb7bbcaa8 100644
--- a/src/plugins/platforms/windows/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@@ -69,7 +69,7 @@ set(openglblacklists_resource_files
     "openglblacklists/default.json"
 )
 
-qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
+qt_internal_add_resource(QWindowsIntegrationPlugin "openglblacklists"
     PREFIX
         "/qt-project.org/windows/openglblacklists"
     FILES
@@ -83,7 +83,7 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qwindowsglcontext.cpp qwindowsglcontext.h
         qwindowsopenglcontext.h
@@ -94,44 +94,44 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
 #### Keys ignored in scope 3:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
     PUBLIC_LIBRARIES
         opengl32
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW
     PUBLIC_LIBRARIES
         uuid
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
     SOURCES
         qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
     SOURCES
         qwindowsclipboard.cpp qwindowsclipboard.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
     SOURCES
         qwindowsdrag.cpp qwindowsdrag.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent
     SOURCES
         qwindowstabletsupport.cpp qwindowstabletsupport.h
     INCLUDE_DIRECTORIES
         ${QT_SOURCE_TREE}/src/3rdparty/wintab
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
     SOURCES
         qwindowssessionmanager.cpp qwindowssessionmanager.h
 )
@@ -162,7 +162,7 @@ if(QT_FEATURE_imageformat_png)
         "images/splitvcursor_64.png"
     )
 
-    qt_add_resource(QWindowsIntegrationPlugin "cursors"
+    qt_internal_add_resource(QWindowsIntegrationPlugin "cursors"
         PREFIX
             "/qt-project.org/windows/cursors"
         FILES
@@ -170,7 +170,7 @@ if(QT_FEATURE_imageformat_png)
     )
 endif()
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
         uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
         uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
@@ -193,7 +193,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
         uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
     PUBLIC_LIBRARIES
         uuid
 )
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
index fe12102811..2f1182190d 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -70,7 +70,7 @@ set(openglblacklists_resource_files
     "openglblacklists/default.json"
 )
 
-qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
+qt_internal_add_resource(QWindowsIntegrationPlugin "openglblacklists"
     PREFIX
         "/qt-project.org/windows/openglblacklists"
     FILES
@@ -84,7 +84,7 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qwindowsglcontext.cpp qwindowsglcontext.h
         qwindowsopenglcontext.h
@@ -95,44 +95,44 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
 #### Keys ignored in scope 3:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
     PUBLIC_LIBRARIES
         opengl32
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW
     PUBLIC_LIBRARIES
         uuid
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
     SOURCES
         qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
     SOURCES
         qwindowsclipboard.cpp qwindowsclipboard.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
     SOURCES
         qwindowsdrag.cpp qwindowsdrag.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent
     SOURCES
         qwindowstabletsupport.cpp qwindowstabletsupport.h
     INCLUDE_DIRECTORIES
         ${QT_SOURCE_TREE}/src/3rdparty/wintab
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
     SOURCES
         qwindowssessionmanager.cpp qwindowssessionmanager.h
 )
@@ -163,7 +163,7 @@ if(QT_FEATURE_imageformat_png)
         "images/splitvcursor_64.png"
     )
 
-    qt_add_resource(QWindowsIntegrationPlugin "cursors"
+    qt_internal_add_resource(QWindowsIntegrationPlugin "cursors"
         PREFIX
             "/qt-project.org/windows/cursors"
         FILES
@@ -171,7 +171,7 @@ if(QT_FEATURE_imageformat_png)
     )
 endif()
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
         uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
         uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
@@ -194,7 +194,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
         uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
+qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
     PUBLIC_LIBRARIES
         uuid
 )
diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
index 67802a85ae..58f635c081 100644
--- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## XcbQpa Module:
 #####################################################################
 
-qt_add_module(XcbQpa
+qt_internal_add_module(XcbQpa
     INTERNAL_MODULE
     NO_MODULE_HEADERS
     SOURCES
@@ -61,50 +61,50 @@ qt_add_module(XcbQpa
 ## Scopes:
 #####################################################################
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
         Qt::OpenGLPrivate
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_glib
     LIBRARIES
         GLIB2::GLIB2
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
     SOURCES
         qxcbdrag.cpp qxcbdrag.h
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
     PUBLIC_LIBRARIES
         X11::XCB
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
     SOURCES
         qxcbsessionmanager.cpp qxcbsessionmanager.h
     PUBLIC_LIBRARIES
         ${X11_SM_LIB} ${X11_ICE_LIB}
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
     SOURCES
         qxcbvulkaninstance.cpp qxcbvulkaninstance.h
         qxcbvulkanwindow.cpp qxcbvulkanwindow.h
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC
+qt_internal_extend_target(XcbQpa CONDITION CLANG AND NOT ICC
     COMPILE_OPTIONS
         -ftemplate-depth=1024
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
     SOURCES
         nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h
         nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
@@ -117,12 +117,12 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
         nativepainting
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
     PUBLIC_LIBRARIES
         PkgConfig::XRender
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 182ec53d8b..7e78e9502f 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## XcbQpa Module:
 #####################################################################
 
-qt_add_module(XcbQpa
+qt_internal_add_module(XcbQpa
     INTERNAL_MODULE
     NO_MODULE_HEADERS
     SOURCES
@@ -65,22 +65,22 @@ qt_disable_apple_app_extension_api_only(XcbQpa)
 ## Scopes:
 #####################################################################
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
         Qt::OpenGLPrivate
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_glib
     LIBRARIES
         GLIB2::GLIB2
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
     SOURCES
         qxcbdrag.cpp qxcbdrag.h
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
     PUBLIC_LIBRARIES
         X11::XCB
         # special case begin
@@ -91,30 +91,30 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
         # special case end
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
     SOURCES
         qxcbsessionmanager.cpp qxcbsessionmanager.h
     PUBLIC_LIBRARIES
         ${X11_SM_LIB} ${X11_ICE_LIB}
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
     SOURCES
         qxcbvulkaninstance.cpp qxcbvulkaninstance.h
         qxcbvulkanwindow.cpp qxcbvulkanwindow.h
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC
+qt_internal_extend_target(XcbQpa CONDITION CLANG AND NOT ICC
     COMPILE_OPTIONS
         -ftemplate-depth=1024
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
     SOURCES
         nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h
         nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
@@ -127,19 +127,19 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
         nativepainting
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
     PUBLIC_LIBRARIES
         PkgConfig::XRender
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
+qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
 
 # special case begin
 if(TARGET XCB::XINPUT)
-    qt_extend_target(XcbQpa LIBRARIES XCB::XINPUT)
+    qt_internal_extend_target(XcbQpa LIBRARIES XCB::XINPUT)
 else()
     set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c")
     set_source_files_properties(
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 94d9b60310..24cdf8f636 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx
+qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx
     PUBLIC_LIBRARIES
         XCB::GLX
 )
 
-qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static
+qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
 )
diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt
index cebd216592..061eeae2fd 100644
--- a/src/plugins/sqldrivers/db2/CMakeLists.txt
+++ b/src/plugins/sqldrivers/db2/CMakeLists.txt
@@ -26,7 +26,7 @@ qt_internal_add_plugin(QDB2DriverPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STREQUAL "x86_64")
+qt_internal_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STREQUAL "x86_64")
     DEFINES
         ODBC64
 )
diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt
index 93af813691..617fce8453 100644
--- a/src/plugins/sqldrivers/oci/CMakeLists.txt
+++ b/src/plugins/sqldrivers/oci/CMakeLists.txt
@@ -26,7 +26,7 @@ qt_internal_add_plugin(QOCIDriverPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QOCIDriverPlugin CONDITION APPLE
+qt_internal_extend_target(QOCIDriverPlugin CONDITION APPLE
     LINK_OPTIONS
         "-Wl,-flat_namespace,-U,_environ"
 )
diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
index 5c71b578c0..0411d271cc 100644
--- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
@@ -26,7 +26,7 @@ qt_internal_add_plugin(QODBCDriverPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QODBCDriverPlugin CONDITION UNIX
+qt_internal_extend_target(QODBCDriverPlugin CONDITION UNIX
     DEFINES
         UNICODE
 )
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
index ab8f1eb2b6..1c86a79acf 100644
--- a/src/plugins/sqldrivers/odbc/CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -28,7 +28,7 @@ qt_internal_add_plugin(QODBCDriverPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QODBCDriverPlugin CONDITION UNIX
+qt_internal_extend_target(QODBCDriverPlugin CONDITION UNIX
     DEFINES
         UNICODE
 )
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
index 25796d9bb5..c34e2119f9 100644
--- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
@@ -26,12 +26,12 @@ qt_internal_add_plugin(QSQLiteDriverPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite
     PUBLIC_LIBRARIES
         SQLite::SQLite3
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite
     SOURCES
         ../../../3rdparty/sqlite/sqlite3.c
     DEFINES
@@ -46,37 +46,37 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite
         ../../../3rdparty/sqlite
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite
     DEFINES
         NDEBUG
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite
     DEFINES
         SQLITE_DISABLE_LFS
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite
     DEFINES
         HAVE_POSIX_FALLOCATE=1
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite
     DEFINES
         _QNX_SOURCE
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite
     DEFINES
         HAVE_USLEEP=1
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
     DEFINES
         SQLITE_OMIT_LOAD_EXTENSION
 )
diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
index 154516b5ff..2da5233525 100644
--- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
@@ -26,7 +26,7 @@ qt_internal_add_plugin(QSQLiteDriverPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite
     PUBLIC_LIBRARIES
         SQLite::SQLite3
 )
@@ -38,7 +38,7 @@ if (NOT QT_FEATURE_system_sqlite)
 endif()
 # special case end
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite
     SOURCES
         ../../../3rdparty/sqlite/sqlite3.c
     DEFINES
@@ -53,37 +53,37 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite
         ../../../3rdparty/sqlite
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite
     DEFINES
         NDEBUG
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite
     DEFINES
         SQLITE_DISABLE_LFS
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite
     DEFINES
         HAVE_POSIX_FALLOCATE=1
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite
     DEFINES
         _QNX_SOURCE
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite
     DEFINES
         HAVE_USLEEP=1
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
+qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
     DEFINES
         SQLITE_OMIT_LOAD_EXTENSION
 )
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
index 65c7a945a3..6372030148 100644
--- a/src/printsupport/CMakeLists.txt
+++ b/src/printsupport/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## PrintSupport Module:
 #####################################################################
 
-qt_add_module(PrintSupport
+qt_internal_add_module(PrintSupport
     PLUGIN_TYPES printsupport
     SOURCES
         kernel/qpaintengine_alpha.cpp kernel/qpaintengine_alpha_p.h
@@ -44,7 +44,7 @@ qt_add_module(PrintSupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(PrintSupport CONDITION MACOS
+qt_internal_extend_target(PrintSupport CONDITION MACOS
     SOURCES
         platform/macos/qcocoaprintdevice.mm platform/macos/qcocoaprintdevice_p.h
         platform/macos/qcocoaprintersupport.mm platform/macos/qcocoaprintersupport_p.h
@@ -57,13 +57,13 @@ qt_extend_target(PrintSupport CONDITION MACOS
         "platform/macos/qcocoaprintersupport.mm"
 )
 
-qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget
+qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget
     SOURCES
         kernel/qpaintengine_preview.cpp kernel/qpaintengine_preview_p.h
         widgets/qprintpreviewwidget.cpp widgets/qprintpreviewwidget.h
 )
 
-qt_extend_target(PrintSupport CONDITION WIN32
+qt_internal_extend_target(PrintSupport CONDITION WIN32
     SOURCES
         kernel/qprintengine_win.cpp kernel/qprintengine_win_p.h
     LIBRARIES
@@ -73,19 +73,19 @@ qt_extend_target(PrintSupport CONDITION WIN32
         winspool
 )
 
-qt_extend_target(PrintSupport CONDITION QT_FEATURE_cups AND UNIX AND NOT APPLE
+qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_cups AND UNIX AND NOT APPLE
     SOURCES
         kernel/qcups.cpp kernel/qcups_p.h
 )
 
-qt_extend_target(PrintSupport CONDITION QT_FEATURE_cupsjobwidget AND UNIX AND NOT APPLE
+qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_cupsjobwidget AND UNIX AND NOT APPLE
     SOURCES
         widgets/qcupsjobwidget.cpp widgets/qcupsjobwidget.ui widgets/qcupsjobwidget_p.h
     ENABLE_AUTOGEN_TOOLS
         uic
 )
 
-qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog
+qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog
     SOURCES
         dialogs/qabstractprintdialog.cpp dialogs/qabstractprintdialog.h dialogs/qabstractprintdialog_p.h
         dialogs/qpagesetupdialog.cpp dialogs/qpagesetupdialog.h dialogs/qpagesetupdialog_p.h
@@ -130,7 +130,7 @@ if(QT_FEATURE_printdialog)
         "images/zoom-out-32.png"
     )
 
-    qt_add_resource(PrintSupport "qprintdialog"
+    qt_internal_add_resource(PrintSupport "qprintdialog"
         PREFIX
             "/qt-project.org/dialogs/qprintpreviewdialog"
         BASE
@@ -143,7 +143,7 @@ if(QT_FEATURE_printdialog)
         "images/status-gray-scale.png"
     )
 
-    qt_add_resource(PrintSupport "qprintdialog1"
+    qt_internal_add_resource(PrintSupport "qprintdialog1"
         PREFIX
             "/qt-project.org/dialogs/qprintdialog"
         BASE
@@ -153,7 +153,7 @@ if(QT_FEATURE_printdialog)
     )
 endif()
 
-qt_extend_target(PrintSupport CONDITION MACOS AND QT_FEATURE_printdialog
+qt_internal_extend_target(PrintSupport CONDITION MACOS AND QT_FEATURE_printdialog
     SOURCES
         dialogs/qpagesetupdialog_mac.mm
         dialogs/qprintdialog_mac.mm
@@ -161,13 +161,13 @@ qt_extend_target(PrintSupport CONDITION MACOS AND QT_FEATURE_printdialog
         ${FWAppKit}
 )
 
-qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND WIN32
+qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND WIN32
     SOURCES
         dialogs/qpagesetupdialog_win.cpp
         dialogs/qprintdialog_win.cpp
 )
 
-qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APPLE
+qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APPLE
     SOURCES
         dialogs/qpagesetupdialog_unix.cpp dialogs/qpagesetupdialog_unix_p.h
         dialogs/qprintdialog_unix.cpp
@@ -180,11 +180,11 @@ qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT
         uic
 )
 
-qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog
+qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog
     SOURCES
         dialogs/qprintpreviewdialog.cpp dialogs/qprintpreviewdialog.h
 )
-qt_add_docs(PrintSupport
+qt_internal_add_docs(PrintSupport
     doc/qtprintsupport.qdocconf
 )
 
diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index 1bf3a3df2a..43ec949fdd 100644
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Sql Module:
 #####################################################################
 
-qt_add_module(Sql
+qt_internal_add_module(Sql
     PLUGIN_TYPES sqldrivers
     SOURCES
         kernel/qsqlcachedresult.cpp kernel/qsqlcachedresult_p.h
@@ -39,19 +39,19 @@ qt_add_module(Sql
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x62000000"
 )
 
-qt_extend_target(Sql CONDITION QT_FEATURE_sqlmodel
+qt_internal_extend_target(Sql CONDITION QT_FEATURE_sqlmodel
     SOURCES
         models/qsqlquerymodel.cpp models/qsqlquerymodel.h models/qsqlquerymodel_p.h
         models/qsqlrelationaldelegate.cpp models/qsqlrelationaldelegate.h
         models/qsqlrelationaltablemodel.cpp models/qsqlrelationaltablemodel.h
         models/qsqltablemodel.cpp models/qsqltablemodel.h models/qsqltablemodel_p.h
 )
-qt_add_docs(Sql
+qt_internal_add_docs(Sql
     doc/qtsql.qdocconf
 )
 
diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt
index 2eef3edbef..a00c4cef13 100644
--- a/src/testlib/.prev_CMakeLists.txt
+++ b/src/testlib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Test Module:
 #####################################################################
 
-qt_add_module(Test
+qt_internal_add_module(Test
     QMAKE_MODULE_CONFIG console testlib_defines
     EXCEPTIONS
     SOURCES
@@ -72,29 +72,29 @@ qt_add_module(Test
 #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded:
 # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library"
 
-qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester
+qt_internal_extend_target(Test CONDITION QT_FEATURE_itemmodeltester
     SOURCES
         qabstractitemmodeltester.cpp qabstractitemmodeltester.h
 )
 
-qt_extend_target(Test CONDITION QT_FEATURE_valgrind
+qt_internal_extend_target(Test CONDITION QT_FEATURE_valgrind
     SOURCES
         qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h
 )
 
-qt_extend_target(Test CONDITION embedded
+qt_internal_extend_target(Test CONDITION embedded
     COMPILE_OPTIONS
         -fno-rtti
 )
 
-qt_extend_target(Test CONDITION APPLE
+qt_internal_extend_target(Test CONDITION APPLE
     SOURCES
         qappletestlogger.cpp qappletestlogger_p.h
     PUBLIC_LIBRARIES
         ${FWSecurity}
 )
 
-qt_extend_target(Test CONDITION MACOS
+qt_internal_extend_target(Test CONDITION MACOS
     SOURCES
         qtestutil_macos.mm qtestutil_macos_p.h
     PUBLIC_LIBRARIES
@@ -104,7 +104,7 @@ qt_extend_target(Test CONDITION MACOS
         ${FWIOKit}
 )
 
-qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))
+qt_internal_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))
     SOURCES
         qxctestlogger.mm qxctestlogger_p.h
     DEFINES
@@ -113,7 +113,7 @@ qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VE
         ${FWFoundation}
 )
 
-qt_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY)
+qt_internal_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY)
     COMPILE_OPTIONS
         -F/Developer/Library/Frameworks
     LINK_OPTIONS
@@ -133,7 +133,7 @@ qt_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_V
 
 #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network:
 # HEADERSCLEAN_EXCLUDE = "qtest_network.h"
-qt_add_docs(Test
+qt_internal_add_docs(Test
     doc/qttestlib.qdocconf
 )
 
diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
index 226bf079b8..53005d6402 100644
--- a/src/testlib/CMakeLists.txt
+++ b/src/testlib/CMakeLists.txt
@@ -8,7 +8,7 @@ include(selfcover.cmake)
 ## Test Module:
 #####################################################################
 
-qt_add_module(Test
+qt_internal_add_module(Test
     CONFIG_MODULE_NAME testlib # special case
     EXCEPTIONS
     SOURCES
@@ -77,29 +77,29 @@ qt_add_module(Test
 #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded:
 # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library"
 
-qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester
+qt_internal_extend_target(Test CONDITION QT_FEATURE_itemmodeltester
     SOURCES
         qabstractitemmodeltester.cpp qabstractitemmodeltester.h
 )
 
-qt_extend_target(Test CONDITION QT_FEATURE_valgrind
+qt_internal_extend_target(Test CONDITION QT_FEATURE_valgrind
     SOURCES
         qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h
 )
 
-qt_extend_target(Test CONDITION embedded
+qt_internal_extend_target(Test CONDITION embedded
     COMPILE_OPTIONS
         -fno-rtti
 )
 
-qt_extend_target(Test CONDITION APPLE
+qt_internal_extend_target(Test CONDITION APPLE
     SOURCES
         qappletestlogger.cpp qappletestlogger_p.h
     PUBLIC_LIBRARIES
         ${FWSecurity}
 )
 
-qt_extend_target(Test CONDITION MACOS
+qt_internal_extend_target(Test CONDITION MACOS
     SOURCES
         qtestutil_macos.mm qtestutil_macos_p.h
     PUBLIC_LIBRARIES
@@ -111,8 +111,8 @@ qt_extend_target(Test CONDITION MACOS
 
 # special case begin
 # Do not bother with disabled stuff:
-# extend_target(Test CONDITION (MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ...
-# extend_target(Test CONDITION ((MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ...
+# qt_internal_extend_target(Test CONDITION (MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ...
+# qt_internal_extend_target(Test CONDITION ((MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ...
 # special case end
 
 #### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY:
@@ -126,12 +126,12 @@ qt_extend_target(Test CONDITION MACOS
 
 #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network:
 # HEADERSCLEAN_EXCLUDE = "qtest_network.h"
-qt_add_docs(Test
+qt_internal_add_docs(Test
     doc/qttestlib.qdocconf
 )
 
 # special case begin
-qt_apply_testlib_coverage_options(Test)
+qt_internal_apply_testlib_coverage_options(Test)
 
 # Allow blacklisting tests depending on whether testlib was built as part of a CMake build.
 target_compile_definitions(Test PRIVATE QT_CMAKE_BUILD)
diff --git a/src/testlib/selfcover.cmake b/src/testlib/selfcover.cmake
index c04ffa7b01..83af041951 100644
--- a/src/testlib/selfcover.cmake
+++ b/src/testlib/selfcover.cmake
@@ -17,7 +17,7 @@ endif()
 
 # This enables verification that testlib itself is adequately tested,
 # as a grounds for trusting that testing with it is useful.
-function(qt_apply_testlib_coverage_options target)
+function(qt_internal_apply_testlib_coverage_options target)
     if (NOT FEATURE_testlib_selfcover)
         return()
     endif()
diff --git a/src/tools/androiddeployqt/.prev_CMakeLists.txt b/src/tools/androiddeployqt/.prev_CMakeLists.txt
index bb644c6fc1..3989e2f506 100644
--- a/src/tools/androiddeployqt/.prev_CMakeLists.txt
+++ b/src/tools/androiddeployqt/.prev_CMakeLists.txt
@@ -24,7 +24,7 @@ set_target_properties(androiddeployqt PROPERTIES
 ## Scopes:
 #####################################################################
 
-qt_extend_target(androiddeployqt CONDITION windows
+qt_internal_extend_target(androiddeployqt CONDITION windows
     COMPILE_OPTIONS
         -U__STRICT_ANSI__
 )
diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt
index 0a0886fc75..4eec7b8164 100644
--- a/src/tools/androiddeployqt/CMakeLists.txt
+++ b/src/tools/androiddeployqt/CMakeLists.txt
@@ -24,7 +24,7 @@ set_target_properties(androiddeployqt PROPERTIES
 ## Scopes:
 #####################################################################
 
-qt_extend_target(androiddeployqt CONDITION windows
+qt_internal_extend_target(androiddeployqt CONDITION windows
     COMPILE_OPTIONS
         -U__STRICT_ANSI__
 )
diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt
index 17cf825869..9f6eb600bc 100644
--- a/src/tools/androidtestrunner/CMakeLists.txt
+++ b/src/tools/androidtestrunner/CMakeLists.txt
@@ -24,7 +24,7 @@ set_target_properties(androidtestrunner PROPERTIES
 ## Scopes:
 #####################################################################
 
-qt_extend_target(androidtestrunner CONDITION windows
+qt_internal_extend_target(androidtestrunner CONDITION windows
     COMPILE_OPTIONS
         -U__STRICT_ANSI__
 )
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index b42582efd8..bf93a3958d 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Bootstrap Module:
 #####################################################################
 
-qt_add_module(Bootstrap
+qt_internal_add_module(Bootstrap
     STATIC
     INTERNAL_MODULE
     NO_SYNC_QT
@@ -164,7 +164,7 @@ qt_add_module(Bootstrap
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Bootstrap CONDITION UNIX
+qt_internal_extend_target(Bootstrap CONDITION UNIX
     SOURCES
         ../../corelib/io/qfilesystemengine_unix.cpp
         ../../corelib/io/qfilesystemiterator_unix.cpp
@@ -178,7 +178,7 @@ qt_extend_target(Bootstrap CONDITION UNIX
         ../../corelib/kernel/qsystemsemaphore_unix.cpp
 )
 
-qt_extend_target(Bootstrap CONDITION WIN32
+qt_internal_extend_target(Bootstrap CONDITION WIN32
     SOURCES
         ../../corelib/global/qoperatingsystemversion_win.cpp
         ../../corelib/io/qfilesystemengine_win.cpp
@@ -200,7 +200,7 @@ qt_extend_target(Bootstrap CONDITION WIN32
         user32
 )
 
-qt_extend_target(Bootstrap CONDITION APPLE
+qt_internal_extend_target(Bootstrap CONDITION APPLE
     SOURCES
         ../../corelib/global/qoperatingsystemversion_darwin.mm
         ../../corelib/kernel/qcore_foundation.mm
@@ -210,24 +210,24 @@ qt_extend_target(Bootstrap CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(Bootstrap CONDITION MACOS
+qt_internal_extend_target(Bootstrap CONDITION MACOS
     SOURCES
         ../../corelib/io/qstandardpaths_mac.mm
     LIBRARIES
         ${FWCoreServices}
 )
 
-qt_extend_target(Bootstrap CONDITION UIKIT
+qt_internal_extend_target(Bootstrap CONDITION UIKIT
     LIBRARIES
         ${FWUIKit}
 )
 
-qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
+qt_internal_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
     SOURCES
         ../../corelib/io/qstandardpaths_unix.cpp
 )
 
-qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
     SOURCES
         ../../3rdparty/zlib/src/adler32.c
         ../../3rdparty/zlib/src/compress.c
@@ -248,12 +248,12 @@ qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_syst
         ../../3rdparty/zlib/src
 )
 
-qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
+qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Bootstrap CONDITION MINGW AND WIN32
+qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32
     PUBLIC_LIBRARIES
         uuid
 )
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index fe69c371cb..7669207fdd 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -9,7 +9,7 @@
 # libraries.
 add_library(Bootstrap STATIC)
 # special case end
-qt_extend_target(Bootstrap
+qt_internal_extend_target(Bootstrap
     SOURCES
         ../../3rdparty/pcre2/src/config.h
         ../../3rdparty/pcre2/src/pcre2.h
@@ -163,7 +163,7 @@ qt_extend_target(Bootstrap
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Bootstrap CONDITION UNIX
+qt_internal_extend_target(Bootstrap CONDITION UNIX
     SOURCES
         ../../corelib/io/qfilesystemengine_unix.cpp
         ../../corelib/io/qfilesystemiterator_unix.cpp
@@ -177,7 +177,7 @@ qt_extend_target(Bootstrap CONDITION UNIX
         ../../corelib/kernel/qsystemsemaphore_unix.cpp
 )
 
-qt_extend_target(Bootstrap CONDITION WIN32
+qt_internal_extend_target(Bootstrap CONDITION WIN32
     SOURCES
         ../../corelib/global/qoperatingsystemversion_win.cpp
         ../../corelib/io/qfilesystemengine_win.cpp
@@ -199,7 +199,7 @@ qt_extend_target(Bootstrap CONDITION WIN32
         user32
 )
 
-qt_extend_target(Bootstrap CONDITION APPLE
+qt_internal_extend_target(Bootstrap CONDITION APPLE
     SOURCES
         ../../corelib/global/qoperatingsystemversion_darwin.mm
         ../../corelib/kernel/qcore_foundation.mm
@@ -209,24 +209,24 @@ qt_extend_target(Bootstrap CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(Bootstrap CONDITION MACOS
+qt_internal_extend_target(Bootstrap CONDITION MACOS
     SOURCES
         ../../corelib/io/qstandardpaths_mac.mm
     LIBRARIES
         ${FWCoreServices}
 )
 
-qt_extend_target(Bootstrap CONDITION UIKIT
+qt_internal_extend_target(Bootstrap CONDITION UIKIT
     LIBRARIES
         ${FWUIKit}
 )
 
-qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
+qt_internal_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
     SOURCES
         ../../corelib/io/qstandardpaths_unix.cpp
 )
 
-qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
     SOURCES
         ../../3rdparty/zlib/src/adler32.c
         ../../3rdparty/zlib/src/compress.c
@@ -247,12 +247,12 @@ qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_syst
         ../../3rdparty/zlib/src
 )
 
-qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
+qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Bootstrap CONDITION MINGW AND WIN32
+qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32
     PUBLIC_LIBRARIES
         uuid
 )
diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt
index 39683d57e4..31bef236e8 100644
--- a/src/tools/cmake_automoc_parser/CMakeLists.txt
+++ b/src/tools/cmake_automoc_parser/CMakeLists.txt
@@ -3,7 +3,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name cmake_automoc_parser)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     BOOTSTRAP
     TOOLS_TARGET Core # special case
     SOURCES
diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt
index f3688020f6..572acc4f36 100644
--- a/src/tools/moc/.prev_CMakeLists.txt
+++ b/src/tools/moc/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name moc)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     BOOTSTRAP
     TARGET_DESCRIPTION "Qt Meta Object Compiler"
     SOURCES
@@ -39,7 +39,7 @@ qt_add_tool(${target_name}
 ## Scopes:
 #####################################################################
 
-qt_extend_target(${target_name} CONDITION MSVC
+qt_internal_extend_target(${target_name} CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index 91c9d89cea..53fc4ff73b 100644
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name moc)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     BOOTSTRAP
     TARGET_DESCRIPTION "Qt Meta Object Compiler"
     TOOLS_TARGET Core # special case
@@ -40,7 +40,7 @@ qt_add_tool(${target_name}
 ## Scopes:
 #####################################################################
 
-qt_extend_target(${target_name} CONDITION MSVC
+qt_internal_extend_target(${target_name} CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
index fa02b5753c..2b1def9f56 100644
--- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qdbuscpp2xml)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler"
     SOURCES
         ../moc/cbordevice.h
@@ -36,12 +36,12 @@ qt_add_tool(${target_name}
 ## Scopes:
 #####################################################################
 
-qt_extend_target(${target_name} CONDITION force_bootstrap
+qt_internal_extend_target(${target_name} CONDITION force_bootstrap
     PUBLIC_LIBRARIES
         bootstrap_dbusPrivate
 )
 
-qt_extend_target(${target_name} CONDITION NOT force_bootstrap
+qt_internal_extend_target(${target_name} CONDITION NOT force_bootstrap
     PUBLIC_LIBRARIES
         Qt::DBusPrivate
 )
diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt
index e831d5f392..865995755b 100644
--- a/src/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qdbuscpp2xml)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler"
     TOOLS_TARGET DBus # special case
     SOURCES
@@ -44,6 +44,6 @@ qt_add_tool(${target_name}
 #####################################################################
 
 # special case begin
-# extend_target(qdbuscpp2xml CONDITION force_bootstrap [...])
-# extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...])
+# qt_internal_extend_target(qdbuscpp2xml CONDITION force_bootstrap [...])
+# qt_internal_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...])
 # special case end
diff --git a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
index 603c21ac1e..ad04ca2d3f 100644
--- a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
+++ b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qdbusxml2cpp)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler"
     SOURCES
         qdbusxml2cpp.cpp
@@ -23,12 +23,12 @@ qt_add_tool(${target_name}
 ## Scopes:
 #####################################################################
 
-qt_extend_target(${target_name} CONDITION NOT force_bootstrap
+qt_internal_extend_target(${target_name} CONDITION NOT force_bootstrap
     PUBLIC_LIBRARIES
         Qt::DBusPrivate
 )
 
-qt_extend_target(${target_name} CONDITION force_bootstrap
+qt_internal_extend_target(${target_name} CONDITION force_bootstrap
     PUBLIC_LIBRARIES
         bootstrap_dbusPrivate
 )
diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt
index 5b58975afe..37327b34db 100644
--- a/src/tools/qdbusxml2cpp/CMakeLists.txt
+++ b/src/tools/qdbusxml2cpp/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qdbusxml2cpp)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler"
     TOOLS_TARGET DBus # special case
     SOURCES
@@ -31,7 +31,7 @@ qt_add_tool(${target_name}
 #####################################################################
 
 # special case begin
-# extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap [...])
-# extend_target(qdbusxml2cpp CONDITION NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...])
-# extend_target(qdbusxml2cpp CONDITION force_bootstrap [...])
+# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap [...])
+# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...])
+# qt_internal_extend_target(qdbusxml2cpp CONDITION force_bootstrap [...])
 # special case end
diff --git a/src/tools/qlalr/.prev_CMakeLists.txt b/src/tools/qlalr/.prev_CMakeLists.txt
index 00c4abc0cd..fecc431731 100644
--- a/src/tools/qlalr/.prev_CMakeLists.txt
+++ b/src/tools/qlalr/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qlalr)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator"
     SOURCES
         compress.cpp compress.h
diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt
index b0137d4918..b3dd7c28b7 100644
--- a/src/tools/qlalr/CMakeLists.txt
+++ b/src/tools/qlalr/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qlalr)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator"
     TOOLS_TARGET Core # special case
     SOURCES
diff --git a/src/tools/qvkgen/.prev_CMakeLists.txt b/src/tools/qvkgen/.prev_CMakeLists.txt
index ed8c028686..a735b31a05 100644
--- a/src/tools/qvkgen/.prev_CMakeLists.txt
+++ b/src/tools/qvkgen/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qvkgen)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt Vulkan Header Generator"
     SOURCES
         qvkgen.cpp
diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt
index 003b407fdc..a6d264d53e 100644
--- a/src/tools/qvkgen/CMakeLists.txt
+++ b/src/tools/qvkgen/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qvkgen)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt Vulkan Header Generator"
     TOOLS_TARGET Gui # special case
     SOURCES
diff --git a/src/tools/rcc/.prev_CMakeLists.txt b/src/tools/rcc/.prev_CMakeLists.txt
index 7b2eff21c3..cd10a9b50c 100644
--- a/src/tools/rcc/.prev_CMakeLists.txt
+++ b/src/tools/rcc/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name rcc)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     BOOTSTRAP
     TARGET_DESCRIPTION "Qt Resource Compiler"
     SOURCES
@@ -26,14 +26,14 @@ qt_add_tool(${target_name}
 ## Scopes:
 #####################################################################
 
-qt_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING
+qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING
     DEFINES
         QT_FEATURE_zstd=1
     LIBRARIES
         ZSTD::ZSTD
 )
 
-qt_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd
+qt_internal_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd
     DEFINES
         QT_FEATURE_zstd=-1
 )
diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
index 4b71695d47..f9bb7025a2 100644
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name rcc)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     BOOTSTRAP
     TARGET_DESCRIPTION "Qt Resource Compiler"
     TOOLS_TARGET Core # special case
@@ -27,14 +27,14 @@ qt_add_tool(${target_name}
 ## Scopes:
 #####################################################################
 
-qt_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING
+qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING
     DEFINES
         QT_FEATURE_zstd=1
     LIBRARIES
         ZSTD::ZSTD
 )
 
-qt_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd
+qt_internal_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd
     DEFINES
         QT_FEATURE_zstd=-1
 )
diff --git a/src/tools/tracegen/.prev_CMakeLists.txt b/src/tools/tracegen/.prev_CMakeLists.txt
index dbb673216f..51dde9f7cc 100644
--- a/src/tools/tracegen/.prev_CMakeLists.txt
+++ b/src/tools/tracegen/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name tracegen)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     BOOTSTRAP
     SOURCES
         etw.cpp etw.h
diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt
index 678b46cb21..ac1e11c974 100644
--- a/src/tools/tracegen/CMakeLists.txt
+++ b/src/tools/tracegen/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name tracegen)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     BOOTSTRAP
     TOOLS_TARGET Core # special case
     SOURCES
diff --git a/src/tools/uic/.prev_CMakeLists.txt b/src/tools/uic/.prev_CMakeLists.txt
index eb5a82572e..20c5e1a7c6 100644
--- a/src/tools/uic/.prev_CMakeLists.txt
+++ b/src/tools/uic/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name uic)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt User Interface Compiler"
     SOURCES
         cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h
diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index c25b53f7d3..afda54d179 100644
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name uic)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt User Interface Compiler"
     TOOLS_TARGET Widgets # special case
     SOURCES
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt
index 277ad0b469..f2d3448e0d 100644
--- a/src/widgets/.prev_CMakeLists.txt
+++ b/src/widgets/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Widgets Module:
 #####################################################################
 
-qt_add_module(Widgets
+qt_internal_add_module(Widgets
     GENERATE_METATYPES
     QMAKE_MODULE_CONFIG uic
     PLUGIN_TYPES styles
@@ -236,7 +236,7 @@ set(qstyle_resource_files
     "images/viewlist-32.png"
 )
 
-qt_add_resource(Widgets "qstyle"
+qt_internal_add_resource(Widgets "qstyle"
     PREFIX
         "/qt-project.org/styles/commonstyle"
     BASE
@@ -271,7 +271,7 @@ set(qstyle1_resource_files
     "images/toolbar-ext-macstyle@2x.png"
 )
 
-qt_add_resource(Widgets "qstyle1"
+qt_internal_add_resource(Widgets "qstyle1"
     PREFIX
         "/qt-project.org/styles/macstyle"
     BASE
@@ -292,12 +292,12 @@ endif()
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x65000000"
 )
 
-qt_extend_target(Widgets CONDITION MACOS
+qt_internal_extend_target(Widgets CONDITION MACOS
     SOURCES
         kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h
     LIBRARIES
@@ -305,269 +305,269 @@ qt_extend_target(Widgets CONDITION MACOS
         z
 )
 
-qt_extend_target(Widgets CONDITION WIN32
+qt_internal_extend_target(Widgets CONDITION WIN32
     LIBRARIES
         dwmapi
         shell32
         uxtheme
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
     SOURCES
         effects/qgraphicseffect.cpp effects/qgraphicseffect.h effects/qgraphicseffect_p.h
         effects/qpixmapfilter.cpp effects/qpixmapfilter_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_action
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_action
     SOURCES
         kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h
         kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_formlayout
     SOURCES
         kernel/qformlayout.cpp kernel/qformlayout.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_shortcut
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_shortcut
     SOURCES
         kernel/qshortcut_widgets.cpp
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tooltip
     SOURCES
         kernel/qtooltip.cpp kernel/qtooltip.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_whatsthis
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_whatsthis
     SOURCES
         kernel/qwhatsthis.cpp kernel/qwhatsthis.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_animation
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_animation
     SOURCES
         styles/qstyleanimation.cpp styles/qstyleanimation_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_style_windows
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_windows
     SOURCES
         styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h
         styles/qwindowsstyle_p_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_style_fusion
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_fusion
     SOURCES
         styles/qfusionstyle.cpp styles/qfusionstyle_p.h
         styles/qfusionstyle_p_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton
     SOURCES
         widgets/qabstractbutton.cpp widgets/qabstractbutton.h widgets/qabstractbutton_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_abstractslider
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_abstractslider
     SOURCES
         widgets/qabstractslider.cpp widgets/qabstractslider.h widgets/qabstractslider_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_buttongroup
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_buttongroup
     SOURCES
         widgets/qbuttongroup.cpp widgets/qbuttongroup.h widgets/qbuttongroup_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget
     SOURCES
         widgets/qcalendarwidget.cpp widgets/qcalendarwidget.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_checkbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_checkbox
     SOURCES
         widgets/qcheckbox.cpp widgets/qcheckbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_combobox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_combobox
     SOURCES
         widgets/qcombobox.cpp widgets/qcombobox.h widgets/qcombobox_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton
     SOURCES
         widgets/qcommandlinkbutton.cpp widgets/qcommandlinkbutton.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit
     SOURCES
         widgets/qdatetimeedit.cpp widgets/qdatetimeedit.h widgets/qdatetimeedit_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_dial
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dial
     SOURCES
         widgets/qdial.cpp widgets/qdial.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_dockwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dockwidget
     SOURCES
         widgets/qdockarealayout.cpp widgets/qdockarealayout_p.h
         widgets/qdockwidget.cpp widgets/qdockwidget.h widgets/qdockwidget_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_effects
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_effects
     SOURCES
         widgets/qeffects.cpp widgets/qeffects_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox
     SOURCES
         widgets/qfontcombobox.cpp widgets/qfontcombobox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_groupbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_groupbox
     SOURCES
         widgets/qgroupbox.cpp widgets/qgroupbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit
     SOURCES
         widgets/qkeysequenceedit.cpp widgets/qkeysequenceedit.h widgets/qkeysequenceedit_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_label
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_label
     SOURCES
         widgets/qlabel.cpp widgets/qlabel.h widgets/qlabel_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber
     SOURCES
         widgets/qlcdnumber.cpp widgets/qlcdnumber.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_lineedit
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_lineedit
     SOURCES
         widgets/qlineedit.cpp widgets/qlineedit.h widgets/qlineedit_p.cpp widgets/qlineedit_p.h
         widgets/qwidgetlinecontrol.cpp widgets/qwidgetlinecontrol_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_mainwindow
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_mainwindow
     SOURCES
         widgets/qmainwindow.cpp widgets/qmainwindow.h
         widgets/qmainwindowlayout.cpp widgets/qmainwindowlayout_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_mdiarea
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_mdiarea
     SOURCES
         widgets/qmdiarea.cpp widgets/qmdiarea.h widgets/qmdiarea_p.h
         widgets/qmdisubwindow.cpp widgets/qmdisubwindow.h widgets/qmdisubwindow_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_menu
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_menu
     SOURCES
         widgets/qmenu.cpp widgets/qmenu.h widgets/qmenu_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_menubar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_menubar
     SOURCES
         widgets/qmenubar.cpp widgets/qmenubar.h widgets/qmenubar_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_progressbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_progressbar
     SOURCES
         widgets/qprogressbar.cpp widgets/qprogressbar.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_pushbutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_pushbutton
     SOURCES
         widgets/qpushbutton.cpp widgets/qpushbutton.h widgets/qpushbutton_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_radiobutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_radiobutton
     SOURCES
         widgets/qradiobutton.cpp widgets/qradiobutton.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_resizehandler
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_resizehandler
     SOURCES
         widgets/qwidgetresizehandler.cpp widgets/qwidgetresizehandler_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox
     SOURCES
         widgets/qdialogbuttonbox.cpp widgets/qdialogbuttonbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_rubberband
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_rubberband
     SOURCES
         widgets/qrubberband.cpp widgets/qrubberband.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_scrollarea
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scrollarea
     SOURCES
         widgets/qscrollarea.cpp widgets/qscrollarea.h widgets/qscrollarea_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_scrollbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scrollbar
     SOURCES
         widgets/qscrollbar.cpp widgets/qscrollbar.h widgets/qscrollbar_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_sizegrip
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_sizegrip
     SOURCES
         widgets/qsizegrip.cpp widgets/qsizegrip.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_slider
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_slider
     SOURCES
         widgets/qslider.cpp widgets/qslider.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_spinbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_spinbox
     SOURCES
         widgets/qabstractspinbox.cpp widgets/qabstractspinbox.h widgets/qabstractspinbox_p.h
         widgets/qspinbox.cpp widgets/qspinbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_splashscreen
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_splashscreen
     SOURCES
         widgets/qsplashscreen.cpp widgets/qsplashscreen.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_splitter
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_splitter
     SOURCES
         widgets/qsplitter.cpp widgets/qsplitter.h widgets/qsplitter_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget
     SOURCES
         widgets/qstackedwidget.cpp widgets/qstackedwidget.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_statusbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_statusbar
     SOURCES
         widgets/qstatusbar.cpp widgets/qstatusbar.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tabbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tabbar
     SOURCES
         widgets/qtabbar.cpp widgets/qtabbar.h widgets/qtabbar_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_textedit
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_textedit
     SOURCES
         widgets/qplaintextedit.cpp widgets/qplaintextedit.h widgets/qplaintextedit_p.h
         widgets/qtextedit.cpp widgets/qtextedit.h widgets/qtextedit_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_textbrowser
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_textbrowser
     SOURCES
         widgets/qtextbrowser.cpp widgets/qtextbrowser.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tabwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tabwidget
     SOURCES
         widgets/qtabwidget.cpp widgets/qtabwidget.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbar
     SOURCES
         widgets/qtoolbar.cpp widgets/qtoolbar.h widgets/qtoolbar_p.h
         widgets/qtoolbararealayout.cpp widgets/qtoolbararealayout_p.h
@@ -575,44 +575,44 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar
         widgets/qtoolbarseparator.cpp widgets/qtoolbarseparator_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_toolbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbox
     SOURCES
         widgets/qtoolbox.cpp widgets/qtoolbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_toolbutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbutton
     SOURCES
         widgets/qtoolbarextension.cpp widgets/qtoolbarextension_p.h
         widgets/qtoolbutton.cpp widgets/qtoolbutton.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol
     SOURCES
         widgets/qwidgettextcontrol.cpp widgets/qwidgettextcontrol_p.h
         widgets/qwidgettextcontrol_p_p.h
 )
 
-qt_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar)
+qt_internal_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar)
     SOURCES
         widgets/qmenu_mac.mm
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_colordialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_colordialog
     SOURCES
         dialogs/qcolordialog.cpp dialogs/qcolordialog.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_dialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dialog
     SOURCES
         dialogs/qdialog.cpp dialogs/qdialog.h dialogs/qdialog_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_errormessage
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_errormessage
     SOURCES
         dialogs/qerrormessage.cpp dialogs/qerrormessage.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filedialog
     SOURCES
         dialogs/qfiledialog.cpp dialogs/qfiledialog.h dialogs/qfiledialog.ui dialogs/qfiledialog_p.h
         dialogs/qsidebar.cpp dialogs/qsidebar_p.h
@@ -620,22 +620,22 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog
         uic
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_fontdialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontdialog
     SOURCES
         dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_fscompleter
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fscompleter
     SOURCES
         dialogs/qfscompleter_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_inputdialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_inputdialog
     SOURCES
         dialogs/qinputdialog.cpp dialogs/qinputdialog.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_messagebox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_messagebox
     SOURCES
         dialogs/qmessagebox.cpp dialogs/qmessagebox.h
 )
@@ -646,7 +646,7 @@ if(QT_FEATURE_messagebox)
         "images/qtlogo-64.png"
     )
 
-    qt_add_resource(Widgets "qmessagebox"
+    qt_internal_add_resource(Widgets "qmessagebox"
         PREFIX
             "/qt-project.org/qmessagebox"
         BASE
@@ -656,22 +656,22 @@ if(QT_FEATURE_messagebox)
     )
 endif()
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_progressdialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_progressdialog
     SOURCES
         dialogs/qprogressdialog.cpp dialogs/qprogressdialog.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_wizard
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_wizard
     SOURCES
         dialogs/qwizard.cpp dialogs/qwizard.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32
     SOURCES
         dialogs/qwizard_win.cpp dialogs/qwizard_win_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_accessibility
     SOURCES
         accessible/complexwidgets.cpp accessible/complexwidgets_p.h
         accessible/qaccessiblemenu.cpp accessible/qaccessiblemenu_p.h
@@ -682,12 +682,12 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility
         accessible/simplewidgets.cpp accessible/simplewidgets_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews
     SOURCES
         accessible/itemviews.cpp accessible/itemviews_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_itemviews
     SOURCES
         itemviews/qabstractitemdelegate.cpp itemviews/qabstractitemdelegate.h itemviews/qabstractitemdelegate_p.h
         itemviews/qabstractitemview.cpp itemviews/qabstractitemview.h itemviews/qabstractitemview_p.h
@@ -699,49 +699,49 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews
         itemviews/qwidgetitemdata_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_columnview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_columnview
     SOURCES
         itemviews/qcolumnview.cpp itemviews/qcolumnview.h itemviews/qcolumnview_p.h
         itemviews/qcolumnviewgrip.cpp itemviews/qcolumnviewgrip_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper
     SOURCES
         itemviews/qdatawidgetmapper.cpp itemviews/qdatawidgetmapper.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_listview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_listview
     SOURCES
         itemviews/qlistview.cpp itemviews/qlistview.h itemviews/qlistview_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_listwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_listwidget
     SOURCES
         itemviews/qlistwidget.cpp itemviews/qlistwidget.h itemviews/qlistwidget_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tableview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tableview
     SOURCES
         itemviews/qtableview.cpp itemviews/qtableview.h itemviews/qtableview_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tablewidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tablewidget
     SOURCES
         itemviews/qtablewidget.cpp itemviews/qtablewidget.h itemviews/qtablewidget_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_treeview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_treeview
     SOURCES
         itemviews/qtreeview.cpp itemviews/qtreeview.h itemviews/qtreeview_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_treewidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_treewidget
     SOURCES
         itemviews/qtreewidget.cpp itemviews/qtreewidget.h itemviews/qtreewidget_p.h
         itemviews/qtreewidgetitemiterator.cpp itemviews/qtreewidgetitemiterator.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicsview
     SOURCES
         graphicsview/qgraph_p.h
         graphicsview/qgraphicsanchorlayout.cpp graphicsview/qgraphicsanchorlayout.h graphicsview/qgraphicsanchorlayout_p.cpp graphicsview/qgraphicsanchorlayout_p.h
@@ -765,41 +765,41 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview
         graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview
     SOURCES
         graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_completer
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_completer
     SOURCES
         util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_scroller
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scroller
     SOURCES
         util/qflickgesture.cpp util/qflickgesture_p.h
         util/qscroller.cpp util/qscroller.h util/qscroller_p.h
         util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_undoview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undoview
     SOURCES
         util/qundoview.cpp util/qundoview.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_xcb
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_xcb
     SOURCES
         util/qsystemtrayicon_x11.cpp
 )
 
-qt_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb
+qt_internal_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb
     SOURCES
         util/qsystemtrayicon_qpa.cpp
 )
 
 
-qt_create_tracepoints(Widgets qtwidgets.tracepoints)
-qt_add_docs(Widgets
+qt_internal_create_tracepoints(Widgets qtwidgets.tracepoints)
+qt_internal_add_docs(Widgets
     doc/qtwidgets.qdocconf
 )
 
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 2fb5f64967..1e18191014 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Widgets Module:
 #####################################################################
 
-qt_add_module(Widgets
+qt_internal_add_module(Widgets
     GENERATE_METATYPES
     QMAKE_MODULE_CONFIG uic
     PLUGIN_TYPES styles
@@ -238,7 +238,7 @@ set(qstyle_resource_files
     "images/viewlist-32.png"
 )
 
-qt_add_resource(Widgets "qstyle"
+qt_internal_add_resource(Widgets "qstyle"
     PREFIX
         "/qt-project.org/styles/commonstyle"
     BASE
@@ -273,7 +273,7 @@ set(qstyle1_resource_files
     "images/toolbar-ext-macstyle@2x.png"
 )
 
-qt_add_resource(Widgets "qstyle1"
+qt_internal_add_resource(Widgets "qstyle1"
     PREFIX
         "/qt-project.org/styles/macstyle"
     BASE
@@ -294,12 +294,12 @@ endif()
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x65000000"
 )
 
-qt_extend_target(Widgets CONDITION MACOS
+qt_internal_extend_target(Widgets CONDITION MACOS
     SOURCES
         kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h
     LIBRARIES
@@ -307,269 +307,269 @@ qt_extend_target(Widgets CONDITION MACOS
         z
 )
 
-qt_extend_target(Widgets CONDITION WIN32
+qt_internal_extend_target(Widgets CONDITION WIN32
     LIBRARIES
         dwmapi
         shell32
         uxtheme
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
     SOURCES
         effects/qgraphicseffect.cpp effects/qgraphicseffect.h effects/qgraphicseffect_p.h
         effects/qpixmapfilter.cpp effects/qpixmapfilter_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_action
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_action
     SOURCES
         kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h
         kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_formlayout
     SOURCES
         kernel/qformlayout.cpp kernel/qformlayout.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_shortcut
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_shortcut
     SOURCES
         kernel/qshortcut_widgets.cpp
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tooltip
     SOURCES
         kernel/qtooltip.cpp kernel/qtooltip.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_whatsthis
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_whatsthis
     SOURCES
         kernel/qwhatsthis.cpp kernel/qwhatsthis.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_animation
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_animation
     SOURCES
         styles/qstyleanimation.cpp styles/qstyleanimation_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_style_windows
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_windows
     SOURCES
         styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h
         styles/qwindowsstyle_p_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_style_fusion
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_fusion
     SOURCES
         styles/qfusionstyle.cpp styles/qfusionstyle_p.h
         styles/qfusionstyle_p_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton
     SOURCES
         widgets/qabstractbutton.cpp widgets/qabstractbutton.h widgets/qabstractbutton_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_abstractslider
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_abstractslider
     SOURCES
         widgets/qabstractslider.cpp widgets/qabstractslider.h widgets/qabstractslider_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_buttongroup
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_buttongroup
     SOURCES
         widgets/qbuttongroup.cpp widgets/qbuttongroup.h widgets/qbuttongroup_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget
     SOURCES
         widgets/qcalendarwidget.cpp widgets/qcalendarwidget.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_checkbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_checkbox
     SOURCES
         widgets/qcheckbox.cpp widgets/qcheckbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_combobox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_combobox
     SOURCES
         widgets/qcombobox.cpp widgets/qcombobox.h widgets/qcombobox_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton
     SOURCES
         widgets/qcommandlinkbutton.cpp widgets/qcommandlinkbutton.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit
     SOURCES
         widgets/qdatetimeedit.cpp widgets/qdatetimeedit.h widgets/qdatetimeedit_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_dial
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dial
     SOURCES
         widgets/qdial.cpp widgets/qdial.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_dockwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dockwidget
     SOURCES
         widgets/qdockarealayout.cpp widgets/qdockarealayout_p.h
         widgets/qdockwidget.cpp widgets/qdockwidget.h widgets/qdockwidget_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_effects
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_effects
     SOURCES
         widgets/qeffects.cpp widgets/qeffects_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox
     SOURCES
         widgets/qfontcombobox.cpp widgets/qfontcombobox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_groupbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_groupbox
     SOURCES
         widgets/qgroupbox.cpp widgets/qgroupbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit
     SOURCES
         widgets/qkeysequenceedit.cpp widgets/qkeysequenceedit.h widgets/qkeysequenceedit_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_label
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_label
     SOURCES
         widgets/qlabel.cpp widgets/qlabel.h widgets/qlabel_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber
     SOURCES
         widgets/qlcdnumber.cpp widgets/qlcdnumber.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_lineedit
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_lineedit
     SOURCES
         widgets/qlineedit.cpp widgets/qlineedit.h widgets/qlineedit_p.cpp widgets/qlineedit_p.h
         widgets/qwidgetlinecontrol.cpp widgets/qwidgetlinecontrol_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_mainwindow
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_mainwindow
     SOURCES
         widgets/qmainwindow.cpp widgets/qmainwindow.h
         widgets/qmainwindowlayout.cpp widgets/qmainwindowlayout_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_mdiarea
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_mdiarea
     SOURCES
         widgets/qmdiarea.cpp widgets/qmdiarea.h widgets/qmdiarea_p.h
         widgets/qmdisubwindow.cpp widgets/qmdisubwindow.h widgets/qmdisubwindow_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_menu
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_menu
     SOURCES
         widgets/qmenu.cpp widgets/qmenu.h widgets/qmenu_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_menubar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_menubar
     SOURCES
         widgets/qmenubar.cpp widgets/qmenubar.h widgets/qmenubar_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_progressbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_progressbar
     SOURCES
         widgets/qprogressbar.cpp widgets/qprogressbar.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_pushbutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_pushbutton
     SOURCES
         widgets/qpushbutton.cpp widgets/qpushbutton.h widgets/qpushbutton_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_radiobutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_radiobutton
     SOURCES
         widgets/qradiobutton.cpp widgets/qradiobutton.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_resizehandler
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_resizehandler
     SOURCES
         widgets/qwidgetresizehandler.cpp widgets/qwidgetresizehandler_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox
     SOURCES
         widgets/qdialogbuttonbox.cpp widgets/qdialogbuttonbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_rubberband
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_rubberband
     SOURCES
         widgets/qrubberband.cpp widgets/qrubberband.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_scrollarea
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scrollarea
     SOURCES
         widgets/qscrollarea.cpp widgets/qscrollarea.h widgets/qscrollarea_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_scrollbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scrollbar
     SOURCES
         widgets/qscrollbar.cpp widgets/qscrollbar.h widgets/qscrollbar_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_sizegrip
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_sizegrip
     SOURCES
         widgets/qsizegrip.cpp widgets/qsizegrip.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_slider
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_slider
     SOURCES
         widgets/qslider.cpp widgets/qslider.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_spinbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_spinbox
     SOURCES
         widgets/qabstractspinbox.cpp widgets/qabstractspinbox.h widgets/qabstractspinbox_p.h
         widgets/qspinbox.cpp widgets/qspinbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_splashscreen
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_splashscreen
     SOURCES
         widgets/qsplashscreen.cpp widgets/qsplashscreen.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_splitter
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_splitter
     SOURCES
         widgets/qsplitter.cpp widgets/qsplitter.h widgets/qsplitter_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget
     SOURCES
         widgets/qstackedwidget.cpp widgets/qstackedwidget.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_statusbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_statusbar
     SOURCES
         widgets/qstatusbar.cpp widgets/qstatusbar.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tabbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tabbar
     SOURCES
         widgets/qtabbar.cpp widgets/qtabbar.h widgets/qtabbar_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_textedit
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_textedit
     SOURCES
         widgets/qplaintextedit.cpp widgets/qplaintextedit.h widgets/qplaintextedit_p.h
         widgets/qtextedit.cpp widgets/qtextedit.h widgets/qtextedit_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_textbrowser
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_textbrowser
     SOURCES
         widgets/qtextbrowser.cpp widgets/qtextbrowser.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tabwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tabwidget
     SOURCES
         widgets/qtabwidget.cpp widgets/qtabwidget.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbar
     SOURCES
         widgets/qtoolbar.cpp widgets/qtoolbar.h widgets/qtoolbar_p.h
         widgets/qtoolbararealayout.cpp widgets/qtoolbararealayout_p.h
@@ -577,44 +577,44 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar
         widgets/qtoolbarseparator.cpp widgets/qtoolbarseparator_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_toolbox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbox
     SOURCES
         widgets/qtoolbox.cpp widgets/qtoolbox.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_toolbutton
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_toolbutton
     SOURCES
         widgets/qtoolbarextension.cpp widgets/qtoolbarextension_p.h
         widgets/qtoolbutton.cpp widgets/qtoolbutton.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol
     SOURCES
         widgets/qwidgettextcontrol.cpp widgets/qwidgettextcontrol_p.h
         widgets/qwidgettextcontrol_p_p.h
 )
 
-qt_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar)
+qt_internal_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar)
     SOURCES
         widgets/qmenu_mac.mm
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_colordialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_colordialog
     SOURCES
         dialogs/qcolordialog.cpp dialogs/qcolordialog.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_dialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dialog
     SOURCES
         dialogs/qdialog.cpp dialogs/qdialog.h dialogs/qdialog_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_errormessage
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_errormessage
     SOURCES
         dialogs/qerrormessage.cpp dialogs/qerrormessage.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filedialog
     SOURCES
         dialogs/qfiledialog.cpp dialogs/qfiledialog.h dialogs/qfiledialog.ui dialogs/qfiledialog_p.h
         dialogs/qsidebar.cpp dialogs/qsidebar_p.h
@@ -622,22 +622,22 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog
         uic
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_fontdialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontdialog
     SOURCES
         dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_fscompleter
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fscompleter
     SOURCES
         dialogs/qfscompleter_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_inputdialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_inputdialog
     SOURCES
         dialogs/qinputdialog.cpp dialogs/qinputdialog.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_messagebox
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_messagebox
     SOURCES
         dialogs/qmessagebox.cpp dialogs/qmessagebox.h
 )
@@ -648,7 +648,7 @@ if(QT_FEATURE_messagebox)
         "images/qtlogo-64.png"
     )
 
-    qt_add_resource(Widgets "qmessagebox"
+    qt_internal_add_resource(Widgets "qmessagebox"
         PREFIX
             "/qt-project.org/qmessagebox"
         BASE
@@ -658,22 +658,22 @@ if(QT_FEATURE_messagebox)
     )
 endif()
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_progressdialog
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_progressdialog
     SOURCES
         dialogs/qprogressdialog.cpp dialogs/qprogressdialog.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_wizard
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_wizard
     SOURCES
         dialogs/qwizard.cpp dialogs/qwizard.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32
     SOURCES
         dialogs/qwizard_win.cpp dialogs/qwizard_win_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_accessibility
     SOURCES
         accessible/complexwidgets.cpp accessible/complexwidgets_p.h
         accessible/qaccessiblemenu.cpp accessible/qaccessiblemenu_p.h
@@ -684,12 +684,12 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility
         accessible/simplewidgets.cpp accessible/simplewidgets_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews
     SOURCES
         accessible/itemviews.cpp accessible/itemviews_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_itemviews
     SOURCES
         itemviews/qabstractitemdelegate.cpp itemviews/qabstractitemdelegate.h itemviews/qabstractitemdelegate_p.h
         itemviews/qabstractitemview.cpp itemviews/qabstractitemview.h itemviews/qabstractitemview_p.h
@@ -701,49 +701,49 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews
         itemviews/qwidgetitemdata_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_columnview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_columnview
     SOURCES
         itemviews/qcolumnview.cpp itemviews/qcolumnview.h itemviews/qcolumnview_p.h
         itemviews/qcolumnviewgrip.cpp itemviews/qcolumnviewgrip_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper
     SOURCES
         itemviews/qdatawidgetmapper.cpp itemviews/qdatawidgetmapper.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_listview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_listview
     SOURCES
         itemviews/qlistview.cpp itemviews/qlistview.h itemviews/qlistview_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_listwidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_listwidget
     SOURCES
         itemviews/qlistwidget.cpp itemviews/qlistwidget.h itemviews/qlistwidget_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tableview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tableview
     SOURCES
         itemviews/qtableview.cpp itemviews/qtableview.h itemviews/qtableview_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_tablewidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tablewidget
     SOURCES
         itemviews/qtablewidget.cpp itemviews/qtablewidget.h itemviews/qtablewidget_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_treeview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_treeview
     SOURCES
         itemviews/qtreeview.cpp itemviews/qtreeview.h itemviews/qtreeview_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_treewidget
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_treewidget
     SOURCES
         itemviews/qtreewidget.cpp itemviews/qtreewidget.h itemviews/qtreewidget_p.h
         itemviews/qtreewidgetitemiterator.cpp itemviews/qtreewidgetitemiterator.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicsview
     SOURCES
         graphicsview/qgraph_p.h
         graphicsview/qgraphicsanchorlayout.cpp graphicsview/qgraphicsanchorlayout.h graphicsview/qgraphicsanchorlayout_p.cpp graphicsview/qgraphicsanchorlayout_p.h
@@ -767,41 +767,41 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview
         graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview
     SOURCES
         graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_completer
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_completer
     SOURCES
         util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_scroller
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scroller
     SOURCES
         util/qflickgesture.cpp util/qflickgesture_p.h
         util/qscroller.cpp util/qscroller.h util/qscroller_p.h
         util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_undoview
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undoview
     SOURCES
         util/qundoview.cpp util/qundoview.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_xcb
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_xcb
     SOURCES
         util/qsystemtrayicon_x11.cpp
 )
 
-qt_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb
+qt_internal_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb
     SOURCES
         util/qsystemtrayicon_qpa.cpp
 )
 
 
-qt_create_tracepoints(Widgets qtwidgets.tracepoints)
-qt_add_docs(Widgets
+qt_internal_create_tracepoints(Widgets qtwidgets.tracepoints)
+qt_internal_add_docs(Widgets
     doc/qtwidgets.qdocconf
 )
 
diff --git a/src/winmain/.prev_CMakeLists.txt b/src/winmain/.prev_CMakeLists.txt
deleted file mode 100644
index 5b08a0e863..0000000000
--- a/src/winmain/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated from winmain.pro.
-
-#####################################################################
-## qtLibraryTarget$$TARGET$$QT_LIBINFIX Module:
-#####################################################################
-
-add_qt_module(qtLibraryTarget$$TARGET$$QT_LIBINFIX
-    STATIC
-    DEFINES
-        QT_NO_FOREACH
-    PUBLIC_LIBRARIES
-        Qt::Core
-)
-
-#### Keys ignored in scope 1:.:.:winmain.pro:<TRUE>:
-# CONFIG = "static"
-# DESTDIR = "$$QT.core.libs"
-# TEMPLATE = "lib"
-# _LOADED = "qt_installs" "qt_targets" "qt_build_paths" "qt_common"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 3:.:.:winmain.pro:QT_FEATURE_debug_and_release:
-# CONFIG = "build_all"
-
-#### Keys ignored in scope 4:.:.:winmain.pro:MSVC:
-# QMAKE_CFLAGS_DEBUG = "--Zi" "-Z7"
-
-extend_target(qtLibraryTarget$$TARGET$$QT_LIBINFIX CONDITION mingw
-    DEFINES
-        QT_NEEDS_QMAIN
-)
-
-extend_target(qtLibraryTarget$$TARGET$$QT_LIBINFIX
-    SOURCES
-        qtmain_win.cpp
-    LIBRARIES
-        shell32
-)
-
-#### Keys ignored in scope 10:.:.:winmain.pro:else:
-# CONFIG = "-qt"
diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt
index fca2609082..1a74a1e3ae 100644
--- a/src/winmain/CMakeLists.txt
+++ b/src/winmain/CMakeLists.txt
@@ -4,7 +4,7 @@ if (NOT WIN32)
     return()
 endif()
 
-qt_add_module(WinMain
+qt_internal_add_module(WinMain
   STATIC
   NO_SYNC_QT
   NO_MODULE_HEADERS
@@ -22,12 +22,12 @@ endif()
 
 set_property(TARGET WinMain PROPERTY OUTPUT_NAME qtmain)
 
-qt_extend_target(WinMain CONDITION
+qt_internal_extend_target(WinMain CONDITION
     SOURCES qtmain_win.cpp
     LIBRARIES shell32
 )
 
-qt_extend_target(WinMain CONDITION MINGW
+qt_internal_extend_target(WinMain CONDITION MINGW
     DEFINES QT_NEEDS_QMAIN
 )
 # special case end
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 53cbeeaddc..b2db149f8d 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Xml Module:
 #####################################################################
 
-qt_add_module(Xml
+qt_internal_add_module(Xml
     SOURCES
         dom/qdom.cpp dom/qdom.h dom/qdom_p.h
         dom/qdomhelpers.cpp dom/qdomhelpers_p.h
@@ -23,11 +23,11 @@ qt_add_module(Xml
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x61000000"
 )
-qt_add_docs(Xml
+qt_internal_add_docs(Xml
     doc/qtxml.qdocconf
 )
 
diff --git a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt
index be8c936c48..f81bed27d6 100644
--- a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtconcurrentfilter Test:
 #############################################################