CMake: Regenerate projects to use new qt_internal_ API

Modify special case locations to use the new API as well.

Task-number: QTBUG-86815
Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

36 files changed, 213 insertions, 213 deletions

diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt
index 0bc9f28da6..0c431374e8 100644
--- a/src/imports/folderlistmodel/CMakeLists.txt
+++ b/src/imports/folderlistmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlfolderlistmodelplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qmlfolderlistmodelplugin
+qt_internal_add_qml_module(qmlfolderlistmodelplugin
     URI "Qt.labs.folderlistmodel"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QmlFolderListModelPlugin
diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt
index a4de38267e..b1df75b946 100644
--- a/src/imports/labsanimation/CMakeLists.txt
+++ b/src/imports/labsanimation/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## labsanimationplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(labsanimationplugin
+qt_internal_add_qml_module(labsanimationplugin
     URI "Qt.labs.animation"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtLabsAnimationPlugin
diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt
index efd3339e2f..164583dd1e 100644
--- a/src/imports/labsmodels/CMakeLists.txt
+++ b/src/imports/labsmodels/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## labsmodelsplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(labsmodelsplugin
+qt_internal_add_qml_module(labsmodelsplugin
     URI "Qt.labs.qmlmodels"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQmlLabsModelsPlugin
@@ -25,13 +25,13 @@ qt_add_qml_module(labsmodelsplugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_table_model
+qt_internal_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_table_model
     SOURCES
         qqmltablemodel.cpp qqmltablemodel_p.h
         qqmltablemodelcolumn.cpp qqmltablemodelcolumn_p.h
 )
 
-qt_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_delegate_model
+qt_internal_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_delegate_model
     SOURCES
         qqmldelegatecomponent.cpp qqmldelegatecomponent_p.h
 )
diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt
index ffde82d340..445914b71e 100644
--- a/src/imports/layouts/CMakeLists.txt
+++ b/src/imports/layouts/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qquicklayoutsplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qquicklayoutsplugin
+qt_internal_add_qml_module(qquicklayoutsplugin
     URI "QtQuick.Layouts"
     VERSION "${CMAKE_PROJECT_VERSION}"
     DESIGNER_SUPPORTED
diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt
index d3fd8ff290..abbe484874 100644
--- a/src/imports/localstorage/CMakeLists.txt
+++ b/src/imports/localstorage/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmllocalstorageplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qmllocalstorageplugin
+qt_internal_add_qml_module(qmllocalstorageplugin
     URI "QtQuick.LocalStorage"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QQmlLocalStoragePlugin
diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt
index 89d65a22dc..4070ad365b 100644
--- a/src/imports/models/CMakeLists.txt
+++ b/src/imports/models/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## modelsplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(modelsplugin
+qt_internal_add_qml_module(modelsplugin
     URI "QtQml.Models"
     VERSION "${CMAKE_PROJECT_VERSION}"
     DESIGNER_SUPPORTED
diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt
index 6d5e71f7d1..7e754a2cee 100644
--- a/src/imports/particles/CMakeLists.txt
+++ b/src/imports/particles/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## particlesplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(particlesplugin
+qt_internal_add_qml_module(particlesplugin
     URI "QtQuick.Particles"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuick2ParticlesPlugin
diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt
index 52e6d3e1e0..99e76596ea 100644
--- a/src/imports/qtqml/.prev_CMakeLists.txt
+++ b/src/imports/qtqml/.prev_CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 ## qmlplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qmlplugin
+qt_internal_add_qml_module(qmlplugin
     URI "QtQml"
     VERSION "${CMAKE_PROJECT_VERSION}"
     DESIGNER_SUPPORTED
diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt
index 8ad8c0e111..15e66fd53e 100644
--- a/src/imports/qtqml/CMakeLists.txt
+++ b/src/imports/qtqml/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 ## qmlplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qmlplugin
+qt_internal_add_qml_module(qmlplugin
     URI "QtQml"
     VERSION "${CMAKE_PROJECT_VERSION}"
     DESIGNER_SUPPORTED
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt
index aed797189a..e7e29bf9ae 100644
--- a/src/imports/qtquick2/CMakeLists.txt
+++ b/src/imports/qtquick2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtquick2plugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qtquick2plugin
+qt_internal_add_qml_module(qtquick2plugin
     URI "QtQuick"
     VERSION "${CMAKE_PROJECT_VERSION}"
     DESIGNER_SUPPORTED
@@ -31,7 +31,7 @@ qt_add_qml_module(qtquick2plugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qtquick2plugin CONDITION QT_FEATURE_qml_worker_script
+qt_internal_extend_target(qtquick2plugin CONDITION QT_FEATURE_qml_worker_script
     PUBLIC_LIBRARIES
         Qt::QmlWorkerScriptPrivate
 )
diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt
index 0243e2cf8f..bb1c1aae8b 100644
--- a/src/imports/settings/CMakeLists.txt
+++ b/src/imports/settings/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlsettingsplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qmlsettingsplugin
+qt_internal_add_qml_module(qmlsettingsplugin
     URI "Qt.labs.settings"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QmlSettingsPlugin
diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt
index 92ad133fd8..78f6d9f448 100644
--- a/src/imports/shapes/CMakeLists.txt
+++ b/src/imports/shapes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlshapesplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qmlshapesplugin
+qt_internal_add_qml_module(qmlshapesplugin
     URI "QtQuick.Shapes"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QmlShapesPlugin
diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt
index c840fda85f..5ec8533b23 100644
--- a/src/imports/sharedimage/CMakeLists.txt
+++ b/src/imports/sharedimage/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sharedimageplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(sharedimageplugin
+qt_internal_add_qml_module(sharedimageplugin
     URI "Qt.labs.sharedimage"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuickSharedImagePlugin
diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt
index 2ce7598f62..27d0446405 100644
--- a/src/imports/testlib/CMakeLists.txt
+++ b/src/imports/testlib/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmltestplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qmltestplugin
+qt_internal_add_qml_module(qmltestplugin
     URI "QtTest"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QTestQmlModule
diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt
index 3790b7d53e..b6b0008fb6 100644
--- a/src/imports/wavefrontmesh/CMakeLists.txt
+++ b/src/imports/wavefrontmesh/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlwavefrontmeshplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qmlwavefrontmeshplugin
+qt_internal_add_qml_module(qmlwavefrontmeshplugin
     URI "Qt.labs.wavefrontmesh"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QmlWavefrontMeshPlugin
diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt
index 2d437a04da..b2a6d0f444 100644
--- a/src/imports/workerscript/CMakeLists.txt
+++ b/src/imports/workerscript/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## workerscriptplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(workerscriptplugin
+qt_internal_add_qml_module(workerscriptplugin
     URI "QtQml.WorkerScript"
     VERSION "${CMAKE_PROJECT_VERSION}"
     DESIGNER_SUPPORTED
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index c0c72578bd..0eb0b89587 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickParticles Module:
 #####################################################################
 
-qt_add_module(QuickParticles
+qt_internal_add_module(QuickParticles
     INTERNAL_MODULE
     GENERATE_METATYPES
     SOURCES
@@ -57,7 +57,7 @@ set(particles_resource_files
     "particleresources/star.png"
 )
 
-qt_add_resource(QuickParticles "particles"
+qt_internal_add_resource(QuickParticles "particles"
     PREFIX
         "/"
     FILES
@@ -76,7 +76,7 @@ set(particles1_resource_files
     "shaders_ng/imageparticle_tabled.vert.qsb"
 )
 
-qt_add_resource(QuickParticles "particles1"
+qt_internal_add_resource(QuickParticles "particles1"
     PREFIX
         "/particles"
     FILES
@@ -94,7 +94,7 @@ qt_add_resource(QuickParticles "particles1"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QuickParticles CONDITION MSVC
+qt_internal_extend_target(QuickParticles CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
@@ -102,7 +102,7 @@ qt_extend_target(QuickParticles CONDITION MSVC
 #### Keys ignored in scope 3:.:.:particles.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-qt_extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
+qt_internal_extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
     LIBRARIES
         gcov
     COMPILE_OPTIONS
diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
index ddc2af6cfa..30e4296365 100644
--- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
+++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## PacketProtocol Module:
 #####################################################################
 
-qt_add_module(PacketProtocol
+qt_internal_add_module(PacketProtocol
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
index a46c66cfaa..8be9b4fad3 100644
--- a/src/plugins/scenegraph/openvg/CMakeLists.txt
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -46,22 +46,22 @@ qt_internal_add_plugin(QSGOpenVGAdaptation
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QSGOpenVGAdaptation CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release
+qt_internal_extend_target(QSGOpenVGAdaptation CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/debug
 )
 
-qt_extend_target(QSGOpenVGAdaptation CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+qt_internal_extend_target(QSGOpenVGAdaptation CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/release
 )
 
-qt_extend_target(QSGOpenVGAdaptation CONDITION NOT debug_and_release
+qt_internal_extend_target(QSGOpenVGAdaptation CONDITION NOT debug_and_release
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen
 )
 
-qt_extend_target(QSGOpenVGAdaptation CONDITION QT_FEATURE_quick_sprite
+qt_internal_extend_target(QSGOpenVGAdaptation CONDITION QT_FEATURE_quick_sprite
     SOURCES
         qsgopenvgspritenode.cpp qsgopenvgspritenode.h
 )
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index 0d9704423c..676e8727e3 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Qml Module:
 #####################################################################
 
-qt_add_module(Qml
+qt_internal_add_module(Qml
     GENERATE_METATYPES
     PLUGIN_TYPES qmltooling
     SOURCES
@@ -372,24 +372,24 @@ qt_process_qlalr(
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_network
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_network
     SOURCES
         qml/qqmltypeloadernetworkreplyproxy.cpp qml/qqmltypeloadernetworkreplyproxy_p.h
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-qt_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )
 
-qt_extend_target(Qml CONDITION MSVC
+qt_internal_extend_target(Qml CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
 
-qt_extend_target(Qml CONDITION WIN32
+qt_internal_extend_target(Qml CONDITION WIN32
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorWin.cpp
         jsruntime/qv4compilationunitmapper_win.cpp
@@ -402,12 +402,12 @@ qt_extend_target(Qml CONDITION WIN32
 #### Keys ignored in scope 7:.:.:qml.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
+qt_internal_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
     COMPILE_OPTIONS
         -fno-reorder-blocks
 )
 
-qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
+qt_internal_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
     LIBRARIES
         gcov
     COMPILE_OPTIONS
@@ -416,7 +416,7 @@ qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
+qt_internal_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
     COMPILE_OPTIONS
         -d2SSAOptimizer-
 )
@@ -427,7 +427,7 @@ qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 1
 #### Keys ignored in scope 12:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_jit
     SOURCES
         jit/qv4assemblercommon.cpp jit/qv4assemblercommon_p.h
         jit/qv4baselineassembler.cpp jit/qv4baselineassembler_p.h
@@ -437,7 +437,7 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
         jit
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_animation
     SOURCES
         animations/qabstractanimationjob.cpp animations/qabstractanimationjob_p.h
         animations/qanimationgroupjob.cpp animations/qanimationgroupjob_p.h
@@ -467,12 +467,12 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
 # QML_COMPILE_HASH = "$$commit"
 # commit = "$$system(git rev-parse HEAD)"
 
-qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_internal_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_debug
     SOURCES
         debugger/qqmlabstractprofileradapter.cpp debugger/qqmlabstractprofileradapter_p.h
         debugger/qqmlconfigurabledebugservice_p.h
@@ -489,93 +489,93 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug
         jsruntime/qv4profiling.cpp
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
     SOURCES
         jsruntime/qv4sequenceobject.cpp jsruntime/qv4sequenceobject_p.h
 )
 
-qt_extend_target(Qml CONDITION UNIX
+qt_internal_extend_target(Qml CONDITION UNIX
     SOURCES
         jsruntime/qv4compilationunitmapper_unix.cpp
         jsruntime/qv4functiontable_unix.cpp
 )
 
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32
+qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32
     SOURCES
         jsruntime/qv4functiontable_win64.cpp
 )
 
-qt_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64")
+qt_internal_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64")
     SOURCES
         jsruntime/qv4functiontable_noop.cpp
 )
 
-qt_extend_target(Qml CONDITION valgrind
+qt_internal_extend_target(Qml CONDITION valgrind
     DEFINES
         V4_USE_VALGRIND
 )
 
-qt_extend_target(Qml CONDITION heaptrack
+qt_internal_extend_target(Qml CONDITION heaptrack
     DEFINES
         V4_USE_HEAPTRACK
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
     SOURCES
         qml/qqmlxmlhttprequest.cpp qml/qqmlxmlhttprequest_p.h
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_locale
     SOURCES
         qml/qqmllocale.cpp qml/qqmllocale_p.h
 )
 
-qt_extend_target(Qml CONDITION ANDROID
+qt_internal_extend_target(Qml CONDITION ANDROID
     DEFINES
         LIBS_SUFFIX="_${CMAKE_SYSTEM_PROCESSOR}.so"
 )
 
-qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
+qt_internal_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
     LIBRARIES
         rt
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
     SOURCES
         types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h
 )
 
-qt_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_internal_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-qt_extend_target(Qml CONDITION NOT disassembler
+qt_internal_extend_target(Qml CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-qt_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_internal_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_internal_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
@@ -583,17 +583,17 @@ qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AN
 #### Keys ignored in scope 66:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
 
-qt_extend_target(Qml CONDITION INTEGRITY
+qt_internal_extend_target(Qml CONDITION INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp
 )
 
-qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY
+qt_internal_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorPosix.cpp
 )
 
-qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
+qt_internal_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
     SOURCES
         ../3rdparty/masm/disassembler/udis86/udis86.c
         ../3rdparty/masm/disassembler/udis86/udis86_decode.c
@@ -621,20 +621,20 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
 #### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
 # GENERATEDDIR = "$$GENERATEDDIR/release"
 
-qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
+qt_internal_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
     COMPILE_OPTIONS
         -Wno-c++0x-extensions
         -Wno-c++11-extensions
 )
 
-qt_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
+qt_internal_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
     COMPILE_OPTIONS
         -Wno-c++0x-compat
 )
 
 
-qt_create_tracepoints(Qml qtqml.tracepoints)
-qt_add_docs(Qml
+qt_internal_create_tracepoints(Qml qtqml.tracepoints)
+qt_internal_add_docs(Qml
     doc/qtqml.qdocconf
 )
 
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index e8a46849db..68e5a94734 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Qml Module:
 #####################################################################
 
-qt_add_module(Qml
+qt_internal_add_module(Qml
     GENERATE_METATYPES
     PLUGIN_TYPES qmltooling
     SOURCES
@@ -380,24 +380,24 @@ qt_declarative_generate_reg_exp_jit_tables(Qml)
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_network
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_network
     SOURCES
         qml/qqmltypeloadernetworkreplyproxy.cpp qml/qqmltypeloadernetworkreplyproxy_p.h
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-qt_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )
 
-qt_extend_target(Qml CONDITION MSVC
+qt_internal_extend_target(Qml CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
 
-qt_extend_target(Qml CONDITION WIN32
+qt_internal_extend_target(Qml CONDITION WIN32
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorWin.cpp
         jsruntime/qv4compilationunitmapper_win.cpp
@@ -410,12 +410,12 @@ qt_extend_target(Qml CONDITION WIN32
 #### Keys ignored in scope 7:.:.:qml.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
+qt_internal_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
     COMPILE_OPTIONS
         -fno-reorder-blocks
 )
 
-qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
+qt_internal_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
     LIBRARIES
         gcov
     COMPILE_OPTIONS
@@ -424,7 +424,7 @@ qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
+qt_internal_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
     COMPILE_OPTIONS
         -d2SSAOptimizer-
 )
@@ -435,7 +435,7 @@ qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 1
 #### Keys ignored in scope 12:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_jit
     SOURCES
         jit/qv4assemblercommon.cpp jit/qv4assemblercommon_p.h
         jit/qv4baselineassembler.cpp jit/qv4baselineassembler_p.h
@@ -445,7 +445,7 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
         jit
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_animation
     SOURCES
         animations/qabstractanimationjob.cpp animations/qabstractanimationjob_p.h
         animations/qanimationgroupjob.cpp animations/qanimationgroupjob_p.h
@@ -475,12 +475,12 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
 # QML_COMPILE_HASH = "$$commit"
 # commit = "$$system(git rev-parse HEAD)"
 
-qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_internal_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_debug
     SOURCES
         debugger/qqmlabstractprofileradapter.cpp debugger/qqmlabstractprofileradapter_p.h
         debugger/qqmlconfigurabledebugservice_p.h
@@ -497,93 +497,93 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug
         jsruntime/qv4profiling.cpp
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
     SOURCES
         jsruntime/qv4sequenceobject.cpp jsruntime/qv4sequenceobject_p.h
 )
 
-qt_extend_target(Qml CONDITION UNIX
+qt_internal_extend_target(Qml CONDITION UNIX
     SOURCES
         jsruntime/qv4compilationunitmapper_unix.cpp
         jsruntime/qv4functiontable_unix.cpp
 )
 
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32
+qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32
     SOURCES
         jsruntime/qv4functiontable_win64.cpp
 )
 
-qt_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64")
+qt_internal_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64")
     SOURCES
         jsruntime/qv4functiontable_noop.cpp
 )
 
-qt_extend_target(Qml CONDITION valgrind
+qt_internal_extend_target(Qml CONDITION valgrind
     DEFINES
         V4_USE_VALGRIND
 )
 
-qt_extend_target(Qml CONDITION heaptrack
+qt_internal_extend_target(Qml CONDITION heaptrack
     DEFINES
         V4_USE_HEAPTRACK
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
     SOURCES
         qml/qqmlxmlhttprequest.cpp qml/qqmlxmlhttprequest_p.h
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_locale
     SOURCES
         qml/qqmllocale.cpp qml/qqmllocale_p.h
 )
 
-qt_extend_target(Qml CONDITION ANDROID
+qt_internal_extend_target(Qml CONDITION ANDROID
     DEFINES
         LIBS_SUFFIX="_${ANDROID_ABI}.so" # special case
 )
 
-qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
+qt_internal_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
     LIBRARIES
         rt
 )
 
-qt_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
+qt_internal_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
     SOURCES
         types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h
 )
 
-qt_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_internal_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_internal_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-qt_extend_target(Qml CONDITION NOT disassembler
+qt_internal_extend_target(Qml CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-qt_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_internal_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_internal_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
@@ -591,17 +591,17 @@ qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AN
 #### Keys ignored in scope 66:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
 
-qt_extend_target(Qml CONDITION INTEGRITY
+qt_internal_extend_target(Qml CONDITION INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp
 )
 
-qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY
+qt_internal_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorPosix.cpp
 )
 
-qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
+qt_internal_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
     SOURCES
         ../3rdparty/masm/disassembler/udis86/udis86.c
         ../3rdparty/masm/disassembler/udis86/udis86_decode.c
@@ -629,20 +629,20 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
 #### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
 # GENERATEDDIR = "$$GENERATEDDIR/release"
 
-qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
+qt_internal_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
     COMPILE_OPTIONS
         -Wno-c++0x-extensions
         -Wno-c++11-extensions
 )
 
-qt_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
+qt_internal_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
     COMPILE_OPTIONS
         -Wno-c++0x-compat
 )
 
 
-qt_create_tracepoints(Qml qtqml.tracepoints)
-qt_add_docs(Qml
+qt_internal_create_tracepoints(Qml qtqml.tracepoints)
+qt_internal_add_docs(Qml
     doc/qtqml.qdocconf
 )
 
diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt
index 396d9c2ea2..8b7c6139f3 100644
--- a/src/qmlcompiler/CMakeLists.txt
+++ b/src/qmlcompiler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlCompiler Module:
 #####################################################################
 
-qt_add_module(QmlCompiler
+qt_internal_add_module(QmlCompiler
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt
index da27e1da49..1801a77793 100644
--- a/src/qmldebug/CMakeLists.txt
+++ b/src/qmldebug/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlDebug Module:
 #####################################################################
 
-qt_add_module(QmlDebug
+qt_internal_add_module(QmlDebug
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt
index 5a26da799d..6ef3e9ec58 100644
--- a/src/qmldevtools/.prev_CMakeLists.txt
+++ b/src/qmldevtools/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlDevTools Module:
 #####################################################################
 
-qt_add_module(QmlDevTools
+qt_internal_add_module(QmlDevTools
     STATIC
     INTERNAL_MODULE
     NO_SYNC_QT
@@ -85,7 +85,7 @@ qt_process_qlalr(
 # QML_COMPILE_HASH = "$$commit"
 # commit = "$$system(git rev-parse HEAD)"
 
-qt_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_internal_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt
index e792b84d99..7a04cf5c47 100644
--- a/src/qmldevtools/CMakeLists.txt
+++ b/src/qmldevtools/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlDevTools Module:
 #####################################################################
 
-qt_add_module(QmlDevTools
+qt_internal_add_module(QmlDevTools
     STATIC
     INTERNAL_MODULE
     NO_SYNC_QT
@@ -132,7 +132,7 @@ add_dependencies(QmlDevTools Qml)
 # QML_COMPILE_HASH = "$$commit"
 # commit = "$$system(git rev-parse HEAD)"
 
-qt_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_internal_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index e4d3903b4f..bb8974fe55 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlModels Module:
 #####################################################################
 
-qt_add_module(QmlModels
+qt_internal_add_module(QmlModels
     GENERATE_METATYPES
     SOURCES
         qqmlchangeset.cpp qqmlchangeset_p.h
@@ -34,26 +34,26 @@ qt_add_module(QmlModels
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model
+qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model
     SOURCES
         qqmlinstantiator.cpp qqmlinstantiator_p.h
         qqmlinstantiator_p_p.h
         qqmlobjectmodel.cpp qqmlobjectmodel_p.h
 )
 
-qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model
+qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model
     SOURCES
         qqmltableinstancemodel.cpp qqmltableinstancemodel_p.h
 )
 
-qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model
+qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model
     SOURCES
         qqmllistmodel.cpp qqmllistmodel_p.h
         qqmllistmodel_p_p.h
         qqmllistmodelworkeragent.cpp qqmllistmodelworkeragent_p.h
 )
 
-qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
+qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
     SOURCES
         qqmlabstractdelegatecomponent.cpp qqmlabstractdelegatecomponent_p.h
         qqmladaptormodel.cpp qqmladaptormodel_p.h
@@ -63,7 +63,7 @@ qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
         qqmllistcompositor.cpp qqmllistcompositor_p.h
         qquickpackage.cpp qquickpackage_p.h
 )
-qt_add_docs(QmlModels
+qt_internal_add_docs(QmlModels
     doc/qtqmlmodels.qdocconf
 )
 
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt
index 33e7bcbaab..f0913be5a1 100644
--- a/src/qmltest/.prev_CMakeLists.txt
+++ b/src/qmltest/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickTest Module:
 #####################################################################
 
-qt_add_module(QuickTest
+qt_internal_add_module(QuickTest
     GENERATE_METATYPES
     QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG}
     SOURCES
@@ -41,14 +41,14 @@ qt_add_module(QuickTest
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(QuickTest CONDITION TARGET Qt::Widgets
     DEFINES
         QT_QMLTEST_WITH_WIDGETS
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
+qt_internal_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
@@ -58,7 +58,7 @@ qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
 
 #### Keys ignored in scope 5:.:.:qmltest.pro:else:
 # COPIES = "qmldir"
-qt_add_docs(QuickTest
+qt_internal_add_docs(QuickTest
     doc/qtqmltest.qdocconf
 )
 
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index 9e7d76fff8..a139b7abf4 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickTest Module:
 #####################################################################
 
-qt_add_module(QuickTest
+qt_internal_add_module(QuickTest
     GENERATE_METATYPES
     QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG}
     SOURCES
@@ -42,14 +42,14 @@ qt_add_module(QuickTest
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(QuickTest CONDITION TARGET Qt::Widgets
     DEFINES
         QT_QMLTEST_WITH_WIDGETS
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
+qt_internal_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
@@ -59,7 +59,7 @@ qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
 
 #### Keys ignored in scope 5:.:.:qmltest.pro:else:
 # COPIES = "qmldir"
-qt_add_docs(QuickTest
+qt_internal_add_docs(QuickTest
     doc/qtqmltest.qdocconf
 )
 
diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt
index 5d77e64c67..7faf074456 100644
--- a/src/qmltyperegistrar/.prev_CMakeLists.txt
+++ b/src/qmltyperegistrar/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qmltyperegistrar)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Types Registrar"
     SOURCES
         ../qmlcompiler/qqmljsstreamwriter.cpp ../qmlcompiler/qqmljsstreamwriter_p.h
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index 1269461c3a..cefb255cc6 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qmltyperegistrar)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Types Registrar"
     TOOLS_TARGET Qml # special case
     SOURCES
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
index 0ce8a06c72..edfc1a298a 100644
--- a/src/qmlworkerscript/.prev_CMakeLists.txt
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlWorkerScript Module:
 #####################################################################
 
-qt_add_module(QmlWorkerScript
+qt_internal_add_module(QmlWorkerScript
     GENERATE_METATYPES
     SOURCES
         qquickworkerscript.cpp qquickworkerscript_p.h
@@ -57,49 +57,49 @@ qt_add_module(QmlWorkerScript
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QmlWorkerScript CONDITION WIN32
+qt_internal_extend_target(QmlWorkerScript CONDITION WIN32
     DEFINES
         NOMINMAX
 )
 
-qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_internal_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_internal_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_internal_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
 
 #### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
-qt_add_docs(QmlWorkerScript
+qt_internal_add_docs(QmlWorkerScript
     doc/qtqmlworkerscript.qdocconf
 )
 
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 36e2b0dc68..5143edabde 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlWorkerScript Module:
 #####################################################################
 
-qt_add_module(QmlWorkerScript
+qt_internal_add_module(QmlWorkerScript
     GENERATE_METATYPES
     SOURCES
         qquickworkerscript.cpp qquickworkerscript_p.h
@@ -57,49 +57,49 @@ qt_add_module(QmlWorkerScript
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QmlWorkerScript CONDITION WIN32
+qt_internal_extend_target(QmlWorkerScript CONDITION WIN32
     DEFINES
         NOMINMAX
 )
 
-qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_internal_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_internal_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_internal_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
 
 #### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
-qt_add_docs(QmlWorkerScript
+qt_internal_add_docs(QmlWorkerScript
     doc/qtqmlworkerscript.qdocconf
 )
 
diff --git a/src/quick/.prev_CMakeLists.txt b/src/quick/.prev_CMakeLists.txt
index d9d099cce4..3e66181c03 100644
--- a/src/quick/.prev_CMakeLists.txt
+++ b/src/quick/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Quick Module:
 #####################################################################
 
-qt_add_module(Quick
+qt_internal_add_module(Quick
     GENERATE_METATYPES
     PLUGIN_TYPES scenegraph
     SOURCES
@@ -275,7 +275,7 @@ set(scenegraph_resource_files
     "shaders_ng/visualization.vert.qsb"
 )
 
-qt_add_resource(Quick "scenegraph"
+qt_internal_add_resource(Quick "scenegraph"
     PREFIX
         "/qt-project.org/scenegraph"
     BASE
@@ -302,19 +302,19 @@ endif()
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Quick CONDITION QT_FEATURE_qml_network
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_qml_network
     LIBRARIES
         Qt::Network
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_opengl
     LIBRARIES
         Qt::OpenGLPrivate
     PUBLIC_LIBRARIES
         Qt::OpenGL
 )
 
-qt_extend_target(Quick CONDITION MSVC
+qt_internal_extend_target(Quick CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
@@ -322,12 +322,12 @@ qt_extend_target(Quick CONDITION MSVC
 #### Keys ignored in scope 5:.:.:quick.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-qt_extend_target(Quick CONDITION WIN32
+qt_internal_extend_target(Quick CONDITION WIN32
     PUBLIC_LIBRARIES
         user32
 )
 
-qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
+qt_internal_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
     LIBRARIES
         gcov
     COMPILE_OPTIONS
@@ -336,7 +336,7 @@ qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_designer
     SOURCES
         designer/qqmldesignermetaobject.cpp designer/qqmldesignermetaobject_p.h
         designer/qquickdesignercustomobjectdata.cpp designer/qquickdesignercustomobjectdata_p.h
@@ -350,7 +350,7 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer
         designer/qquickdesignerwindowmanager.cpp designer/qquickdesignerwindowmanager_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_accessibility
     SOURCES
         accessible/qaccessiblequickitem.cpp accessible/qaccessiblequickitem_p.h
         accessible/qaccessiblequickview.cpp accessible/qaccessiblequickview_p.h
@@ -375,41 +375,41 @@ qt_extend_target(Quick CONDITION QT_FEATURE_accessibility
 #### Keys ignored in scope 11:.:.:quick.pro:else:
 # COPIES = "qmldir"
 
-qt_extend_target(Quick CONDITION QT_FEATURE_qml_debug
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_qml_debug
     SOURCES
         util/qquickprofiler.cpp
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_shortcut
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_shortcut
     SOURCES
         util/qquickshortcut.cpp util/qquickshortcut_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_path
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_path
     SOURCES
         util/qquickpath.cpp util/qquickpath_p.h
         util/qquickpath_p_p.h
         util/qquickpathinterpolator.cpp util/qquickpathinterpolator_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
     SOURCES
         items/qquickframebufferobject.cpp items/qquickframebufferobject.h
         util/qquickopenglutils.cpp util/qquickopenglutils.h
 )
 
-qt_extend_target(Quick CONDITION IOS OR MACOS
+qt_internal_extend_target(Quick CONDITION IOS OR MACOS
     SOURCES
         scenegraph/coreapi/qsgtexture_mac.mm
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_thread
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_thread
     SOURCES
         scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h
         scenegraph/qsgthreadedrenderloop.cpp scenegraph/qsgthreadedrenderloop_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
     SOURCES
         items/qquickanimatedsprite.cpp items/qquickanimatedsprite_p.h
         items/qquickanimatedsprite_p_p.h
@@ -421,24 +421,24 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
         scenegraph/qsgdefaultspritenode.cpp scenegraph/qsgdefaultspritenode_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop
     SOURCES
         items/qquickdrag.cpp items/qquickdrag_p.h
         items/qquickdroparea.cpp items/qquickdroparea_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage
     SOURCES
         items/qquickanimatedimage.cpp items/qquickanimatedimage_p.h
         items/qquickanimatedimage_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_gridview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_gridview
     SOURCES
         items/qquickgridview.cpp items/qquickgridview_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_itemview
     SOURCES
         items/qquickitemview.cpp items/qquickitemview_p.h
         items/qquickitemview_p_p.h
@@ -446,53 +446,53 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview
         items/qquickitemviewfxitem_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions
     SOURCES
         items/qquickitemviewtransition.cpp items/qquickitemviewtransition_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_listview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_listview
     SOURCES
         items/qquicklistview.cpp items/qquicklistview_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_tableview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_tableview
     SOURCES
         items/qquicktableview.cpp items/qquicktableview_p.h
         items/qquicktableview_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_pathview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_pathview
     SOURCES
         items/qquickpathview.cpp items/qquickpathview_p.h
         items/qquickpathview_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_positioners
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_positioners
     SOURCES
         items/qquickpositioners.cpp items/qquickpositioners_p.h
         items/qquickpositioners_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_flipable
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_flipable
     SOURCES
         items/qquickflipable.cpp items/qquickflipable_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_repeater
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_repeater
     SOURCES
         items/qquickrepeater.cpp items/qquickrepeater_p.h
         items/qquickrepeater_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
     SOURCES
         items/qquickshadereffect.cpp items/qquickshadereffect_p.h
         items/qquickshadereffectmesh.cpp items/qquickshadereffectmesh_p.h
         items/qquickshadereffectsource.cpp items/qquickshadereffectsource_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
     SOURCES
         items/context2d/qquickcanvascontext.cpp items/context2d/qquickcanvascontext_p.h
         items/context2d/qquickcanvasitem.cpp items/context2d/qquickcanvasitem_p.h
@@ -502,15 +502,15 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
         items/context2d/qquickcontext2dtile.cpp items/context2d/qquickcontext2dtile_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_wheelevent
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_wheelevent
     SOURCES
         handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h
         handlers/qquickwheelhandler_p_p.h
 )
 
 
-qt_create_tracepoints(Quick qtquick.tracepoints)
-qt_add_docs(Quick
+qt_internal_create_tracepoints(Quick qtquick.tracepoints)
+qt_internal_add_docs(Quick
     doc/qtquick.qdocconf
 )
 
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 67b6969467..5be34f3295 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Quick Module:
 #####################################################################
 
-qt_add_module(Quick
+qt_internal_add_module(Quick
     GENERATE_METATYPES
     PLUGIN_TYPES scenegraph
     SOURCES
@@ -275,7 +275,7 @@ set(scenegraph_resource_files
     "shaders_ng/visualization.vert.qsb"
 )
 
-qt_add_resource(Quick "scenegraph"
+qt_internal_add_resource(Quick "scenegraph"
     PREFIX
         "/qt-project.org/scenegraph"
     BASE
@@ -302,19 +302,19 @@ endif()
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Quick CONDITION QT_FEATURE_qml_network
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_qml_network
     LIBRARIES
         Qt::Network
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_opengl
     LIBRARIES
         Qt::OpenGLPrivate
     PUBLIC_LIBRARIES
         Qt::OpenGL
 )
 
-qt_extend_target(Quick CONDITION MSVC
+qt_internal_extend_target(Quick CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
@@ -322,12 +322,12 @@ qt_extend_target(Quick CONDITION MSVC
 #### Keys ignored in scope 5:.:.:quick.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-qt_extend_target(Quick CONDITION WIN32
+qt_internal_extend_target(Quick CONDITION WIN32
     PUBLIC_LIBRARIES
         user32
 )
 
-qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
+qt_internal_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
     LIBRARIES
         gcov
     COMPILE_OPTIONS
@@ -336,7 +336,7 @@ qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_designer
     SOURCES
         designer/qqmldesignermetaobject.cpp designer/qqmldesignermetaobject_p.h
         designer/qquickdesignercustomobjectdata.cpp designer/qquickdesignercustomobjectdata_p.h
@@ -350,7 +350,7 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer
         designer/qquickdesignerwindowmanager.cpp designer/qquickdesignerwindowmanager_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_accessibility
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_accessibility
     SOURCES
         accessible/qaccessiblequickitem.cpp accessible/qaccessiblequickitem_p.h
         accessible/qaccessiblequickview.cpp accessible/qaccessiblequickview_p.h
@@ -375,41 +375,41 @@ qt_extend_target(Quick CONDITION QT_FEATURE_accessibility
 #### Keys ignored in scope 11:.:.:quick.pro:else:
 # COPIES = "qmldir"
 
-qt_extend_target(Quick CONDITION QT_FEATURE_qml_debug
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_qml_debug
     SOURCES
         util/qquickprofiler.cpp
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_shortcut
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_shortcut
     SOURCES
         util/qquickshortcut.cpp util/qquickshortcut_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_path
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_path
     SOURCES
         util/qquickpath.cpp util/qquickpath_p.h
         util/qquickpath_p_p.h
         util/qquickpathinterpolator.cpp util/qquickpathinterpolator_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
     SOURCES
         items/qquickframebufferobject.cpp items/qquickframebufferobject.h
         util/qquickopenglutils.cpp util/qquickopenglutils.h
 )
 
-qt_extend_target(Quick CONDITION IOS OR MACOS
+qt_internal_extend_target(Quick CONDITION IOS OR MACOS
     SOURCES
         scenegraph/coreapi/qsgtexture_mac.mm
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_thread
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_thread
     SOURCES
         scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h
         scenegraph/qsgthreadedrenderloop.cpp scenegraph/qsgthreadedrenderloop_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
     SOURCES
         items/qquickanimatedsprite.cpp items/qquickanimatedsprite_p.h
         items/qquickanimatedsprite_p_p.h
@@ -421,24 +421,24 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
         scenegraph/qsgdefaultspritenode.cpp scenegraph/qsgdefaultspritenode_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop
     SOURCES
         items/qquickdrag.cpp items/qquickdrag_p.h
         items/qquickdroparea.cpp items/qquickdroparea_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage
     SOURCES
         items/qquickanimatedimage.cpp items/qquickanimatedimage_p.h
         items/qquickanimatedimage_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_gridview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_gridview
     SOURCES
         items/qquickgridview.cpp items/qquickgridview_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_itemview
     SOURCES
         items/qquickitemview.cpp items/qquickitemview_p.h
         items/qquickitemview_p_p.h
@@ -446,53 +446,53 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview
         items/qquickitemviewfxitem_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions
     SOURCES
         items/qquickitemviewtransition.cpp items/qquickitemviewtransition_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_listview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_listview
     SOURCES
         items/qquicklistview.cpp items/qquicklistview_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_tableview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_tableview
     SOURCES
         items/qquicktableview.cpp items/qquicktableview_p.h
         items/qquicktableview_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_pathview
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_pathview
     SOURCES
         items/qquickpathview.cpp items/qquickpathview_p.h
         items/qquickpathview_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_positioners
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_positioners
     SOURCES
         items/qquickpositioners.cpp items/qquickpositioners_p.h
         items/qquickpositioners_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_flipable
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_flipable
     SOURCES
         items/qquickflipable.cpp items/qquickflipable_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_repeater
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_repeater
     SOURCES
         items/qquickrepeater.cpp items/qquickrepeater_p.h
         items/qquickrepeater_p_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
     SOURCES
         items/qquickshadereffect.cpp items/qquickshadereffect_p.h
         items/qquickshadereffectmesh.cpp items/qquickshadereffectmesh_p.h
         items/qquickshadereffectsource.cpp items/qquickshadereffectsource_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
     SOURCES
         items/context2d/qquickcanvascontext.cpp items/context2d/qquickcanvascontext_p.h
         items/context2d/qquickcanvasitem.cpp items/context2d/qquickcanvasitem_p.h
@@ -502,15 +502,15 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
         items/context2d/qquickcontext2dtile.cpp items/context2d/qquickcontext2dtile_p.h
 )
 
-qt_extend_target(Quick CONDITION QT_FEATURE_wheelevent
+qt_internal_extend_target(Quick CONDITION QT_FEATURE_wheelevent
     SOURCES
         handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h
         handlers/qquickwheelhandler_p_p.h
 )
 
 
-qt_create_tracepoints(Quick qtquick.tracepoints)
-qt_add_docs(Quick
+qt_internal_create_tracepoints(Quick qtquick.tracepoints)
+qt_internal_add_docs(Quick
     doc/qtquick.qdocconf
 )
 
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index 0833d51e1b..ac2615c47b 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickShapes Module:
 #####################################################################
 
-qt_add_module(QuickShapes
+qt_internal_add_module(QuickShapes
     INTERNAL_MODULE
     GENERATE_METATYPES
     SOURCES
@@ -30,7 +30,7 @@ set(qtquickshapes_resource_files
     "shaders_ng/radialgradient.vert.qsb"
 )
 
-qt_add_resource(QuickShapes "qtquickshapes"
+qt_internal_add_resource(QuickShapes "qtquickshapes"
     PREFIX
         "/qt-project.org/shapes"
     FILES
diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt
index db1f39caad..c107723e70 100644
--- a/src/quickwidgets/CMakeLists.txt
+++ b/src/quickwidgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickWidgets Module:
 #####################################################################
 
-qt_add_module(QuickWidgets
+qt_internal_add_module(QuickWidgets
     SOURCES
         qquickwidget.cpp qquickwidget.h qquickwidget_p.h
         qtquickwidgetsglobal.h
@@ -35,7 +35,7 @@ qt_add_module(QuickWidgets
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QuickWidgets CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(QuickWidgets CONDITION QT_FEATURE_opengl
     LIBRARIES
         Qt::OpenGLPrivate
 )