Regenerate all projects with new CMake API version

Change-Id: Ie0db35f674137c229eaf049616f38f8e818f7092 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
author: Alexandru Croitor <alexandru.croitor@qt.io> 2019-11-14 13:31:06 +0100
committer: Alexandru Croitor <alexandru.croitor@qt.io> 2019-11-15 12:24:51 +0000
commit: ba494aaa24defe1401f621b791891e696b308756 (patch)
tree: 3617f29e9625fafbf94609ac79b2decd4033107c /src
parent: 91e32f86b53bb930405a58e19c84746ee85cdf89 (diff)
46 files changed, 192 insertions, 192 deletions
diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt
index 7cd8d75653..e7c0ae5f91 100644
--- a/src/imports/folderlistmodel/CMakeLists.txt
+++ b/src/imports/folderlistmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlfolderlistmodelplugin Plugin:
 #####################################################################
 
-add_qml_module(qmlfolderlistmodelplugin
+qt_add_qml_module(qmlfolderlistmodelplugin
     URI "Qt.labs.folderlistmodel"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QmlFolderListModelPlugin
diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt
index 6b54d02d72..8637496097 100644
--- a/src/imports/labsanimation/CMakeLists.txt
+++ b/src/imports/labsanimation/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## labsanimationplugin Plugin:
 #####################################################################
 
-add_qml_module(labsanimationplugin
+qt_add_qml_module(labsanimationplugin
     URI "Qt.labs.animation"
     VERSION "1.0"
     CLASSNAME QtLabsAnimationPlugin
diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt
index ce3e290a83..c198f02016 100644
--- a/src/imports/labsmodels/CMakeLists.txt
+++ b/src/imports/labsmodels/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## labsmodelsplugin Plugin:
 #####################################################################
 
-add_qml_module(labsmodelsplugin
+qt_add_qml_module(labsmodelsplugin
     URI "Qt.labs.qmlmodels"
     VERSION "1.0"
     CLASSNAME QtQmlLabsModelsPlugin
diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt
index 666aae5dc0..b7dabd13c9 100644
--- a/src/imports/layouts/CMakeLists.txt
+++ b/src/imports/layouts/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qquicklayoutsplugin Plugin:
 #####################################################################
 
-add_qml_module(qquicklayoutsplugin
+qt_add_qml_module(qquicklayoutsplugin
     URI "QtQuick.Layouts"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt
index c785a4bd2e..efbf67e726 100644
--- a/src/imports/localstorage/CMakeLists.txt
+++ b/src/imports/localstorage/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmllocalstorageplugin Plugin:
 #####################################################################
 
-add_qml_module(qmllocalstorageplugin
+qt_add_qml_module(qmllocalstorageplugin
     URI "QtQuick.LocalStorage"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QQmlLocalStoragePlugin
diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt
index 1bfb7a35d3..dc4639725d 100644
--- a/src/imports/models/CMakeLists.txt
+++ b/src/imports/models/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## modelsplugin Plugin:
 #####################################################################
 
-add_qml_module(modelsplugin
+qt_add_qml_module(modelsplugin
     TARGET_PATH "QtQml/Models.2"
     URI "QtQml.Models"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt
index f2f0ae8a84..5117471776 100644
--- a/src/imports/particles/CMakeLists.txt
+++ b/src/imports/particles/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## particlesplugin Plugin:
 #####################################################################
 
-add_qml_module(particlesplugin
+qt_add_qml_module(particlesplugin
     TARGET_PATH "QtQuick/Particles.2"
     URI "QtQuick.Particles"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt
index 281e83242f..827474f2fb 100644
--- a/src/imports/qtqml/.prev_CMakeLists.txt
+++ b/src/imports/qtqml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlplugin Plugin:
 #####################################################################
 
-add_qml_module(qmlplugin
+qt_add_qml_module(qmlplugin
     URI "QtQml"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt
index a8ac5d8b8a..ac1a8e0834 100644
--- a/src/imports/qtqml/CMakeLists.txt
+++ b/src/imports/qtqml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlplugin Plugin:
 #####################################################################
 
-add_qml_module(qmlplugin
+qt_add_qml_module(qmlplugin
     URI "QtQml"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt
index a8dabb3371..3287f5c2a6 100644
--- a/src/imports/qtquick2/CMakeLists.txt
+++ b/src/imports/qtquick2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtquick2plugin Plugin:
 #####################################################################
 
-add_qml_module(qtquick2plugin
+qt_add_qml_module(qtquick2plugin
     TARGET_PATH "QtQuick.2"
     URI "QtQuick"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
@@ -35,7 +35,7 @@ add_qml_module(qtquick2plugin
 ## Scopes:
 #####################################################################
 
-extend_target(qtquick2plugin CONDITION QT_FEATURE_qml_worker_script
+qt_extend_target(qtquick2plugin CONDITION QT_FEATURE_qml_worker_script
     LIBRARIES
         Qt::QmlWorkerScriptPrivate
     PUBLIC_LIBRARIES
diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt
index d3827443e0..1b092331ea 100644
--- a/src/imports/settings/CMakeLists.txt
+++ b/src/imports/settings/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlsettingsplugin Plugin:
 #####################################################################
 
-add_qml_module(qmlsettingsplugin
+qt_add_qml_module(qmlsettingsplugin
     URI "Qt.labs.settings"
     VERSION "1.1"
     CLASSNAME QmlSettingsPlugin
diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt
index 525b25e659..717e6af119 100644
--- a/src/imports/shapes/CMakeLists.txt
+++ b/src/imports/shapes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlshapesplugin Plugin:
 #####################################################################
 
-add_qml_module(qmlshapesplugin
+qt_add_qml_module(qmlshapesplugin
     URI "QtQuick.Shapes"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QmlShapesPlugin
diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt
index dcf1b3f8e2..b6a676fe7b 100644
--- a/src/imports/sharedimage/CMakeLists.txt
+++ b/src/imports/sharedimage/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sharedimageplugin Plugin:
 #####################################################################
 
-add_qml_module(sharedimageplugin
+qt_add_qml_module(sharedimageplugin
     URI "Qt.labs.sharedimage"
     VERSION "1.0"
     CLASSNAME QtQuickSharedImagePlugin
diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt
index a32278e755..a6e53d2027 100644
--- a/src/imports/statemachine/CMakeLists.txt
+++ b/src/imports/statemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtqmlstatemachine Plugin:
 #####################################################################
 
-add_qml_module(qtqmlstatemachine
+qt_add_qml_module(qtqmlstatemachine
     URI "QtQml.StateMachine"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QtQmlStateMachinePlugin
diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt
index dad2b51b83..6e54d1ffcc 100644
--- a/src/imports/testlib/.prev_CMakeLists.txt
+++ b/src/imports/testlib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmltestplugin Plugin:
 #####################################################################
 
-add_qml_module(qmltestplugin
+qt_add_qml_module(qmltestplugin
     URI "QtTest"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QTestQmlModule
diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt
index bb33464ba7..eada3b6df6 100644
--- a/src/imports/testlib/CMakeLists.txt
+++ b/src/imports/testlib/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmltestplugin Plugin:
 #####################################################################
 
-add_qml_module(qmltestplugin
+qt_add_qml_module(qmltestplugin
     URI "QtTest"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QTestQmlModule
diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt
index b43ca7656b..2e708c854e 100644
--- a/src/imports/wavefrontmesh/CMakeLists.txt
+++ b/src/imports/wavefrontmesh/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlwavefrontmeshplugin Plugin:
 #####################################################################
 
-add_qml_module(qmlwavefrontmeshplugin
+qt_add_qml_module(qmlwavefrontmeshplugin
     URI "Qt.labs.wavefrontmesh"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QmlWavefrontMeshPlugin
diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt
index 0f76e020e9..e031a6a28f 100644
--- a/src/imports/window/CMakeLists.txt
+++ b/src/imports/window/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## windowplugin Plugin:
 #####################################################################
 
-add_qml_module(windowplugin
+qt_add_qml_module(windowplugin
     TARGET_PATH "QtQuick/Window.2"
     URI "QtQuick.Window"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt
index 86487e5730..b9948cf84e 100644
--- a/src/imports/workerscript/CMakeLists.txt
+++ b/src/imports/workerscript/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## workerscriptplugin Plugin:
 #####################################################################
 
-add_qml_module(workerscriptplugin
+qt_add_qml_module(workerscriptplugin
     TARGET_PATH "QtQml/WorkerScript.2"
     URI "QtQml.WorkerScript"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index f7aca8859f..199c638cd9 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickParticles Module:
 #####################################################################
 
-add_qt_module(QuickParticles
+qt_add_module(QuickParticles
     INTERNAL_MODULE
     SOURCES
         qquickage.cpp qquickage_p.h
@@ -60,7 +60,7 @@ set(particles_resource_files
     "particleresources/star.png"
 )
 
-add_qt_resource(QuickParticles "particles"
+qt_add_resource(QuickParticles "particles"
     PREFIX
         "/"
     FILES
@@ -89,7 +89,7 @@ set(particles1_resource_files
     "shaders_ng/imageparticle_tabled.vert.qsb"
 )
 
-add_qt_resource(QuickParticles "particles1"
+qt_add_resource(QuickParticles "particles1"
     PREFIX
         "/particles"
     FILES
@@ -103,7 +103,7 @@ add_qt_resource(QuickParticles "particles1"
 ## Scopes:
 #####################################################################
 
-extend_target(QuickParticles CONDITION MSVC
+qt_extend_target(QuickParticles CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
@@ -111,7 +111,7 @@ extend_target(QuickParticles CONDITION MSVC
 #### Keys ignored in scope 3:.:.:particles.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
+qt_extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
     LIBRARIES
         gcov
     COMPILE_OPTIONS
@@ -120,7 +120,7 @@ extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-extend_target(QuickParticles CONDITION QT_FEATURE_quick_shadereffect
+qt_extend_target(QuickParticles CONDITION QT_FEATURE_quick_shadereffect
     SOURCES
         qquickcustomparticle.cpp qquickcustomparticle_p.h
 )
diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
index 7a557b3b3e..d12e30de7d 100644
--- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
+++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## PacketProtocol Module:
 #####################################################################
 
-add_qt_module(PacketProtocol
+qt_add_module(PacketProtocol
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
index f5c3064c2c..dc58cf3b30 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_debugger Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_debugger
+qt_add_plugin(qmldbg_debugger
     TYPE qmltooling
     CLASS_NAME QQmlDebuggerServiceFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
index 8e6d45ab40..213901c75a 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_inspector Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_inspector
+qt_add_plugin(qmldbg_inspector
     TYPE qmltooling
     CLASS_NAME QQmlInspectorServiceFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
index e12b45c8d3..e97c37cc62 100644
--- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_local Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_local
+qt_add_plugin(qmldbg_local
     TYPE qmltooling
     CLASS_NAME QLocalClientConnectionFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
index 5b203a8955..002c575539 100644
--- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_messages Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_messages
+qt_add_plugin(qmldbg_messages
     TYPE qmltooling
     CLASS_NAME QDebugMessageServiceFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
index 95bdce601f..bcea497c95 100644
--- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_native Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_native
+qt_add_plugin(qmldbg_native
     TYPE qmltooling
     CLASS_NAME QQmlNativeDebugConnectorFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
index d93df65eb0..16396c3c97 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_nativedebugger Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_nativedebugger
+qt_add_plugin(qmldbg_nativedebugger
     TYPE qmltooling
     CLASS_NAME QQmlNativeDebugServiceFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
index 79636c8aea..02afaa3155 100644
--- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_preview Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_preview
+qt_add_plugin(qmldbg_preview
     TYPE qmltooling
     CLASS_NAME QQmlPreviewServiceFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
index 06eb52ecfc..3868e5c68d 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_profiler Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_profiler
+qt_add_plugin(qmldbg_profiler
     TYPE qmltooling
     CLASS_NAME QQmlProfilerServiceFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
index 5afeaa1775..4931efb960 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_quickprofiler Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_quickprofiler
+qt_add_plugin(qmldbg_quickprofiler
     TYPE qmltooling
     CLASS_NAME QQuickProfilerAdapterFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
index 6fb864bc24..312302f193 100644
--- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_server Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_server
+qt_add_plugin(qmldbg_server
     TYPE qmltooling
     CLASS_NAME QQmlDebugServerFactory
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
index cfc0503ea3..0b7a1cc981 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmldbg_tcp Plugin:
 #####################################################################
 
-add_qt_plugin(qmldbg_tcp
+qt_add_plugin(qmldbg_tcp
     TYPE qmltooling
     CLASS_NAME QTcpServerConnectionFactory
     SOURCES
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
index 4127556dad..bda18dd619 100644
--- a/src/plugins/scenegraph/openvg/CMakeLists.txt
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qsgopenvgbackend Plugin:
 #####################################################################
 
-add_qt_plugin(qsgopenvgbackend
+qt_add_plugin(qsgopenvgbackend
     TYPE scenegraph
     CLASS_NAME QSGOpenVGAdaptation
     SOURCES
@@ -47,7 +47,7 @@ add_qt_plugin(qsgopenvgbackend
 ## Scopes:
 #####################################################################
 
-extend_target(qsgopenvgbackend CONDITION QT_FEATURE_quick_sprite
+qt_extend_target(qsgopenvgbackend 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 8f5ada93c6..92cb639ab1 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Qml Module:
 #####################################################################
 
-add_qt_module(Qml
+qt_add_module(Qml
     PLUGIN_TYPES qmltooling
     SOURCES
         ../3rdparty/llvm/include/llvm-c/DataTypes.h
@@ -338,24 +338,24 @@ qt_process_qlalr(
 ## Scopes:
 #####################################################################
 
-extend_target(Qml CONDITION QT_FEATURE_qml_network
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_network
     SOURCES
         qml/qqmltypeloadernetworkreplyproxy.cpp qml/qqmltypeloadernetworkreplyproxy_p.h
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )
 
-extend_target(Qml CONDITION MSVC
+qt_extend_target(Qml CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
 
-extend_target(Qml CONDITION WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorWin.cpp
     PUBLIC_LIBRARIES
@@ -365,12 +365,12 @@ extend_target(Qml CONDITION WIN32 AND NOT WINRT
 #### Keys ignored in scope 6:.:.:qml.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
+qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
     COMPILE_OPTIONS
         -fno-reorder-blocks
 )
 
-extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
+qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
     LIBRARIES
         gcov
     COMPILE_OPTIONS
@@ -379,7 +379,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-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_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-
 )
@@ -390,7 +390,7 @@ extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19)
 #### Keys ignored in scope 11:.:.: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"
 
-extend_target(Qml CONDITION QT_FEATURE_qml_jit
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
     SOURCES
         jit/qv4assemblercommon.cpp jit/qv4assemblercommon_p.h
         jit/qv4baselineassembler.cpp jit/qv4baselineassembler_p.h
@@ -400,7 +400,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_jit
         jit
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_animation
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
     SOURCES
         animations/qabstractanimationjob.cpp animations/qabstractanimationjob_p.h
         animations/qanimationgroupjob.cpp animations/qanimationgroupjob_p.h
@@ -430,12 +430,12 @@ extend_target(Qml CONDITION QT_FEATURE_qml_animation
 # QML_COMPILE_HASH = "$$commit"
 # commit = "$$system(git rev-parse HEAD)"
 
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug
     SOURCES
         debugger/qqmlabstractprofileradapter.cpp debugger/qqmlabstractprofileradapter_p.h
         debugger/qqmlconfigurabledebugservice_p.h
@@ -452,100 +452,100 @@ extend_target(Qml CONDITION QT_FEATURE_qml_debug
         jsruntime/qv4profiling.cpp
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
     SOURCES
         jsruntime/qv4sequenceobject.cpp jsruntime/qv4sequenceobject_p.h
 )
 
-extend_target(Qml CONDITION UNIX
+qt_extend_target(Qml CONDITION UNIX
     SOURCES
         jsruntime/qv4compilationunitmapper_unix.cpp
         jsruntime/qv4functiontable_unix.cpp
 )
 
-extend_target(Qml CONDITION WIN32
+qt_extend_target(Qml CONDITION WIN32
     SOURCES
         jsruntime/qv4compilationunitmapper_win.cpp
     DEFINES
         NOMINMAX
 )
 
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
     SOURCES
         jsruntime/qv4functiontable_win64.cpp
 )
 
-extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
     SOURCES
         jsruntime/qv4functiontable_noop.cpp
 )
 
-extend_target(Qml CONDITION valgrind
+qt_extend_target(Qml CONDITION valgrind
     DEFINES
         V4_USE_VALGRIND
 )
 
-extend_target(Qml CONDITION heaptrack
+qt_extend_target(Qml CONDITION heaptrack
     DEFINES
         V4_USE_HEAPTRACK
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
     SOURCES
         qml/qqmlxmlhttprequest.cpp qml/qqmlxmlhttprequest_p.h
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_locale
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale
     SOURCES
         qml/qqmllocale.cpp qml/qqmllocale_p.h
 )
 
-extend_target(Qml CONDITION ANDROID
+qt_extend_target(Qml CONDITION ANDROID
     DEFINES
         LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"'
 )
 
-extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
+qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
     LIBRARIES
         rt
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
     SOURCES
         types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h
 )
 
-extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-extend_target(Qml CONDITION NOT disassembler
+qt_extend_target(Qml CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
@@ -553,22 +553,22 @@ extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND N
 #### Keys ignored in scope 65:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
 
-extend_target(Qml CONDITION WINRT
+qt_extend_target(Qml CONDITION WINRT
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorWinRT.cpp
 )
 
-extend_target(Qml CONDITION INTEGRITY
+qt_extend_target(Qml CONDITION INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp
 )
 
-extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
+qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorPosix.cpp
 )
 
-extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
+qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
     SOURCES
         ../3rdparty/masm/disassembler/udis86/udis86.c
         ../3rdparty/masm/disassembler/udis86/udis86_decode.c
@@ -596,20 +596,20 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
 #### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
 # GENERATEDDIR = "$$GENERATEDDIR/release"
 
-extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
+qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
     COMPILE_OPTIONS
         -Wno-c++0x-extensions
         -Wno-c++11-extensions
 )
 
-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_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)
-add_qt_docs(Qml
+qt_add_docs(Qml
     doc/qtqml.qdocconf
 )
 
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index df2cdf417d..3d476ad6f6 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Qml Module:
 #####################################################################
 
-add_qt_module(Qml
+qt_add_module(Qml
     PLUGIN_TYPES qmltooling
     SOURCES
         ../3rdparty/llvm/include/llvm-c/DataTypes.h
@@ -345,24 +345,24 @@ qt_declarative_generate_reg_exp_jit_tables(Qml)
 ## Scopes:
 #####################################################################
 
-extend_target(Qml CONDITION QT_FEATURE_qml_network
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_network
     SOURCES
         qml/qqmltypeloadernetworkreplyproxy.cpp qml/qqmltypeloadernetworkreplyproxy_p.h
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )
 
-extend_target(Qml CONDITION MSVC
+qt_extend_target(Qml CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
 
-extend_target(Qml CONDITION WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorWin.cpp
     PUBLIC_LIBRARIES
@@ -372,12 +372,12 @@ extend_target(Qml CONDITION WIN32 AND NOT WINRT
 #### Keys ignored in scope 6:.:.:qml.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
+qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
     COMPILE_OPTIONS
         -fno-reorder-blocks
 )
 
-extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
+qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
     LIBRARIES
         gcov
     COMPILE_OPTIONS
@@ -386,7 +386,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-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_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-
 )
@@ -397,7 +397,7 @@ extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19)
 #### Keys ignored in scope 11:.:.: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"
 
-extend_target(Qml CONDITION QT_FEATURE_qml_jit
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
     SOURCES
         jit/qv4assemblercommon.cpp jit/qv4assemblercommon_p.h
         jit/qv4baselineassembler.cpp jit/qv4baselineassembler_p.h
@@ -407,7 +407,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_jit
         jit
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_animation
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
     SOURCES
         animations/qabstractanimationjob.cpp animations/qabstractanimationjob_p.h
         animations/qanimationgroupjob.cpp animations/qanimationgroupjob_p.h
@@ -437,12 +437,12 @@ extend_target(Qml CONDITION QT_FEATURE_qml_animation
 # QML_COMPILE_HASH = "$$commit"
 # commit = "$$system(git rev-parse HEAD)"
 
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug
     SOURCES
         debugger/qqmlabstractprofileradapter.cpp debugger/qqmlabstractprofileradapter_p.h
         debugger/qqmlconfigurabledebugservice_p.h
@@ -459,100 +459,100 @@ extend_target(Qml CONDITION QT_FEATURE_qml_debug
         jsruntime/qv4profiling.cpp
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
     SOURCES
         jsruntime/qv4sequenceobject.cpp jsruntime/qv4sequenceobject_p.h
 )
 
-extend_target(Qml CONDITION UNIX
+qt_extend_target(Qml CONDITION UNIX
     SOURCES
         jsruntime/qv4compilationunitmapper_unix.cpp
         jsruntime/qv4functiontable_unix.cpp
 )
 
-extend_target(Qml CONDITION WIN32
+qt_extend_target(Qml CONDITION WIN32
     SOURCES
         jsruntime/qv4compilationunitmapper_win.cpp
     DEFINES
         NOMINMAX
 )
 
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
     SOURCES
         jsruntime/qv4functiontable_win64.cpp
 )
 
-extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
     SOURCES
         jsruntime/qv4functiontable_noop.cpp
 )
 
-extend_target(Qml CONDITION valgrind
+qt_extend_target(Qml CONDITION valgrind
     DEFINES
         V4_USE_VALGRIND
 )
 
-extend_target(Qml CONDITION heaptrack
+qt_extend_target(Qml CONDITION heaptrack
     DEFINES
         V4_USE_HEAPTRACK
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
     SOURCES
         qml/qqmlxmlhttprequest.cpp qml/qqmlxmlhttprequest_p.h
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_locale
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale
     SOURCES
         qml/qqmllocale.cpp qml/qqmllocale_p.h
 )
 
-extend_target(Qml CONDITION ANDROID
+qt_extend_target(Qml CONDITION ANDROID
     DEFINES
         LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"'
 )
 
-extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
+qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
     LIBRARIES
         rt
 )
 
-extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
     SOURCES
         types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h
 )
 
-extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-extend_target(Qml CONDITION NOT disassembler
+qt_extend_target(Qml CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
@@ -560,22 +560,22 @@ extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND N
 #### Keys ignored in scope 65:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
 
-extend_target(Qml CONDITION WINRT
+qt_extend_target(Qml CONDITION WINRT
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorWinRT.cpp
 )
 
-extend_target(Qml CONDITION INTEGRITY
+qt_extend_target(Qml CONDITION INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp
 )
 
-extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
+qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorPosix.cpp
 )
 
-extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
+qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
     SOURCES
         ../3rdparty/masm/disassembler/udis86/udis86.c
         ../3rdparty/masm/disassembler/udis86/udis86_decode.c
@@ -603,20 +603,20 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
 #### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
 # GENERATEDDIR = "$$GENERATEDDIR/release"
 
-extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
+qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
     COMPILE_OPTIONS
         -Wno-c++0x-extensions
         -Wno-c++11-extensions
 )
 
-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_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)
-add_qt_docs(Qml
+qt_add_docs(Qml
     doc/qtqml.qdocconf
 )
 
diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt
index d39bf7d69b..048293312f 100644
--- a/src/qmldebug/CMakeLists.txt
+++ b/src/qmldebug/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlDebug Module:
 #####################################################################
 
-add_qt_module(QmlDebug
+qt_add_module(QmlDebug
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt
index 32e05de6b2..1497d1bf95 100644
--- a/src/qmldevtools/.prev_CMakeLists.txt
+++ b/src/qmldevtools/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlDevTools Module:
 #####################################################################
 
-add_qt_module(QmlDevTools
+qt_add_module(QmlDevTools
     STATIC
     INTERNAL_MODULE
     NO_SYNC_QT
@@ -86,7 +86,7 @@ qt_process_qlalr(
 # QML_COMPILE_HASH = "$$commit"
 # commit = "$$system(git rev-parse HEAD)"
 
-extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_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 f819a81b0f..d7db2378ee 100644
--- a/src/qmldevtools/CMakeLists.txt
+++ b/src/qmldevtools/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlDevTools Module:
 #####################################################################
 
-add_qt_module(QmlDevTools
+qt_add_module(QmlDevTools
     STATIC
     INTERNAL_MODULE
     NO_SYNC_QT
@@ -114,7 +114,7 @@ add_dependencies(QmlDevTools Qml)
 # QML_COMPILE_HASH = "$$commit"
 # commit = "$$system(git rev-parse HEAD)"
 
-extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_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 360b2dfa96..9cfafd677d 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlModels Module:
 #####################################################################
 
-add_qt_module(QmlModels
+qt_add_module(QmlModels
     SOURCES
         qqmlchangeset.cpp qqmlchangeset_p.h
         qqmlmodelsmodule.cpp qqmlmodelsmodule_p.h
@@ -24,28 +24,28 @@ add_qt_module(QmlModels
 ## Scopes:
 #####################################################################
 
-extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model
     SOURCES
         qqmlinstantiator.cpp qqmlinstantiator_p.h
         qqmlinstantiator_p_p.h
         qqmlobjectmodel.cpp qqmlobjectmodel_p.h
 )
 
-extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model
     SOURCES
         qqmltableinstancemodel.cpp qqmltableinstancemodel_p.h
         qqmltablemodel.cpp qqmltablemodel_p.h
         qqmltablemodelcolumn.cpp qqmltablemodelcolumn_p.h
 )
 
-extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model
     SOURCES
         qqmllistmodel.cpp qqmllistmodel_p.h
         qqmllistmodel_p_p.h
         qqmllistmodelworkeragent.cpp qqmllistmodelworkeragent_p.h
 )
 
-extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
     SOURCES
         qqmladaptormodel.cpp qqmladaptormodel_p.h
         qqmldelegatecomponent.cpp qqmldelegatecomponent_p.h
@@ -55,7 +55,7 @@ extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
         qqmllistcompositor.cpp qqmllistcompositor_p.h
         qquickpackage.cpp qquickpackage_p.h
 )
-add_qt_docs(QmlModels
+qt_add_docs(QmlModels
     doc/qtqmlmodels.qdocconf
 )
 
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt
index e4a5ed71ef..ee1b7d39ab 100644
--- a/src/qmltest/.prev_CMakeLists.txt
+++ b/src/qmltest/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickTest Module:
 #####################################################################
 
-add_qt_module(QuickTest
+qt_add_module(QuickTest
     QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG}
     SOURCES
         qtestoptions_p.h
@@ -35,18 +35,18 @@ add_qt_module(QuickTest
 ## Scopes:
 #####################################################################
 
-extend_target(QuickTest CONDITION TARGET Qt::Widgets
+qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets
     DEFINES
         QT_QMLTEST_WITH_WIDGETS
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
+qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
-add_qt_docs(QuickTest
+qt_add_docs(QuickTest
     doc/qtqmltest.qdocconf
 )
 
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index d576d86036..4760481e35 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickTest Module:
 #####################################################################
 
-add_qt_module(QuickTest
+qt_add_module(QuickTest
     QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG}
     SOURCES
         qtestoptions_p.h
@@ -36,18 +36,18 @@ add_qt_module(QuickTest
 ## Scopes:
 #####################################################################
 
-extend_target(QuickTest CONDITION TARGET Qt::Widgets
+qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets
     DEFINES
         QT_QMLTEST_WITH_WIDGETS
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
+qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
-add_qt_docs(QuickTest
+qt_add_docs(QuickTest
     doc/qtqmltest.qdocconf
 )
 
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
index 21eba19ebc..215231b5b8 100644
--- a/src/qmlworkerscript/.prev_CMakeLists.txt
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlWorkerScript Module:
 #####################################################################
 
-add_qt_module(QmlWorkerScript
+qt_add_module(QmlWorkerScript
     SOURCES
         qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h
         qquickworkerscript.cpp qquickworkerscript_p.h
@@ -48,49 +48,49 @@ add_qt_module(QmlWorkerScript
 ## Scopes:
 #####################################################################
 
-extend_target(QmlWorkerScript CONDITION WIN32
+qt_extend_target(QmlWorkerScript CONDITION WIN32
     DEFINES
         NOMINMAX
 )
 
-extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-extend_target(QmlWorkerScript CONDITION NOT disassembler
+qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_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"
-add_qt_docs(QmlWorkerScript
+qt_add_docs(QmlWorkerScript
     doc/qtqmlworkerscript.qdocconf
 )
 
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 08877cb2de..297e0404d9 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QmlWorkerScript Module:
 #####################################################################
 
-add_qt_module(QmlWorkerScript
+qt_add_module(QmlWorkerScript
     SOURCES
         qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h
         qquickworkerscript.cpp qquickworkerscript_p.h
@@ -48,49 +48,49 @@ add_qt_module(QmlWorkerScript
 ## Scopes:
 #####################################################################
 
-extend_target(QmlWorkerScript CONDITION WIN32
+qt_extend_target(QmlWorkerScript CONDITION WIN32
     DEFINES
         NOMINMAX
 )
 
-extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-extend_target(QmlWorkerScript CONDITION NOT disassembler
+qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_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"
-add_qt_docs(QmlWorkerScript
+qt_add_docs(QmlWorkerScript
     doc/qtqmlworkerscript.qdocconf
 )
 
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 7b6e7076a7..772848eb11 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Quick Module:
 #####################################################################
 
-add_qt_module(Quick
+qt_add_module(Quick
     PLUGIN_TYPES scenegraph
     SOURCES
         handlers/qquickdragaxis.cpp handlers/qquickdragaxis_p.h
@@ -309,7 +309,7 @@ set(scenegraph_resource_files
     "shaders_ng/visualization.vert.qsb"
 )
 
-add_qt_resource(Quick "scenegraph"
+qt_add_resource(Quick "scenegraph"
     PREFIX
         "/qt-project.org/scenegraph"
     BASE
@@ -328,7 +328,7 @@ set(items_resource_files
     "shaders/shadereffectfallback_core.vert"
 )
 
-add_qt_resource(Quick "items"
+qt_add_resource(Quick "items"
     PREFIX
         "/qt-project.org/items"
     BASE
@@ -351,12 +351,12 @@ endif()
 ## Scopes:
 #####################################################################
 
-extend_target(Quick CONDITION QT_FEATURE_qml_network
+qt_extend_target(Quick CONDITION QT_FEATURE_qml_network
     LIBRARIES
         Qt::Network
 )
 
-extend_target(Quick CONDITION MSVC
+qt_extend_target(Quick CONDITION MSVC
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
@@ -364,12 +364,12 @@ extend_target(Quick CONDITION MSVC
 #### Keys ignored in scope 4:.:.:quick.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-extend_target(Quick CONDITION WIN32 AND NOT WINRT
+qt_extend_target(Quick CONDITION WIN32 AND NOT WINRT
     PUBLIC_LIBRARIES
         user32
 )
 
-extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
+qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
     LIBRARIES
         gcov
     COMPILE_OPTIONS
@@ -378,7 +378,7 @@ extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_designer
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer
     SOURCES
         designer/qqmldesignermetaobject.cpp designer/qqmldesignermetaobject_p.h
         designer/qquickdesignercustomobjectdata.cpp designer/qquickdesignercustomobjectdata_p.h
@@ -392,7 +392,7 @@ extend_target(Quick CONDITION QT_FEATURE_quick_designer
         designer/qquickdesignerwindowmanager.cpp designer/qquickdesignerwindowmanager_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_accessibility
+qt_extend_target(Quick CONDITION QT_FEATURE_accessibility
     SOURCES
         accessible/qaccessiblequickitem.cpp accessible/qaccessiblequickitem_p.h
         accessible/qaccessiblequickview.cpp accessible/qaccessiblequickview_p.h
@@ -407,24 +407,24 @@ extend_target(Quick CONDITION QT_FEATURE_accessibility
         Qt::Qml
 )
 
-extend_target(Quick CONDITION QT_FEATURE_qml_debug
+qt_extend_target(Quick CONDITION QT_FEATURE_qml_debug
     SOURCES
         util/qquickprofiler.cpp
 )
 
-extend_target(Quick CONDITION QT_FEATURE_shortcut
+qt_extend_target(Quick CONDITION QT_FEATURE_shortcut
     SOURCES
         util/qquickshortcut.cpp util/qquickshortcut_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_path
+qt_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
 )
 
-extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
+qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
     SOURCES
         items/qquickframebufferobject.cpp items/qquickframebufferobject.h
         items/qquickopenglinfo.cpp items/qquickopenglinfo_p.h
@@ -459,17 +459,17 @@ extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FE
         scenegraph/util/qsgshadersourcebuilder.cpp scenegraph/util/qsgshadersourcebuilder_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_thread AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
+qt_extend_target(Quick CONDITION QT_FEATURE_thread AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
     SOURCES
         scenegraph/qsgthreadedrenderloop.cpp scenegraph/qsgthreadedrenderloop_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_sprite AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
     SOURCES
         scenegraph/qsgdefaultspritenode.cpp scenegraph/qsgdefaultspritenode_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_sprite
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
     SOURCES
         items/qquickanimatedsprite.cpp items/qquickanimatedsprite_p.h
         items/qquickanimatedsprite_p_p.h
@@ -480,29 +480,29 @@ extend_target(Quick CONDITION QT_FEATURE_quick_sprite
         scenegraph/adaptations/software/qsgsoftwarespritenode.cpp scenegraph/adaptations/software/qsgsoftwarespritenode_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_thread
+qt_extend_target(Quick CONDITION QT_FEATURE_thread
     SOURCES
         scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop
     SOURCES
         items/qquickdrag.cpp items/qquickdrag_p.h
         items/qquickdroparea.cpp items/qquickdroparea_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage
     SOURCES
         items/qquickanimatedimage.cpp items/qquickanimatedimage_p.h
         items/qquickanimatedimage_p_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_gridview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_gridview
     SOURCES
         items/qquickgridview.cpp items/qquickgridview_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_itemview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview
     SOURCES
         items/qquickitemview.cpp items/qquickitemview_p.h
         items/qquickitemview_p_p.h
@@ -510,46 +510,46 @@ extend_target(Quick CONDITION QT_FEATURE_quick_itemview
         items/qquickitemviewfxitem_p_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions
     SOURCES
         items/qquickitemviewtransition.cpp items/qquickitemviewtransition_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_listview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_listview
     SOURCES
         items/qquicklistview.cpp items/qquicklistview_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_tableview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_tableview
     SOURCES
         items/qquicktableview.cpp items/qquicktableview_p.h
         items/qquicktableview_p_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_pathview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_pathview
     SOURCES
         items/qquickpathview.cpp items/qquickpathview_p.h
         items/qquickpathview_p_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_positioners
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_positioners
     SOURCES
         items/qquickpositioners.cpp items/qquickpositioners_p.h
         items/qquickpositioners_p_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_flipable
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_flipable
     SOURCES
         items/qquickflipable.cpp items/qquickflipable_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_repeater
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_repeater
     SOURCES
         items/qquickrepeater.cpp items/qquickrepeater_p.h
         items/qquickrepeater_p_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
     SOURCES
         items/qquickgenericshadereffect.cpp items/qquickgenericshadereffect_p.h
         items/qquickshadereffect.cpp items/qquickshadereffect_p.h
@@ -557,7 +557,7 @@ extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
         items/qquickshadereffectsource.cpp items/qquickshadereffectsource_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_opengl AND QT_FEATURE_quick_shadereffect
+qt_extend_target(Quick CONDITION QT_FEATURE_opengl AND QT_FEATURE_quick_shadereffect
     SOURCES
         items/qquickopenglshadereffect.cpp items/qquickopenglshadereffect_p.h
         items/qquickopenglshadereffectnode.cpp items/qquickopenglshadereffectnode_p.h
@@ -566,7 +566,7 @@ extend_target(Quick CONDITION QT_FEATURE_opengl AND QT_FEATURE_quick_shadereffec
 #### Keys ignored in scope 40:.:items:items/items.pri:QT_FEATURE_opengl:
 # OTHER_FILES = "$$PWD/shaders/shadereffect.vert" "$$PWD/shaders/shadereffect.frag" "$$PWD/shaders/shadereffectfallback.vert" "$$PWD/shaders/shadereffectfallback.frag" "$$PWD/shaders/shadereffect_core.vert" "$$PWD/shaders/shadereffect_core.frag" "$$PWD/shaders/shadereffectfallback_core.vert" "$$PWD/shaders/shadereffectfallback_core.frag"
 
-extend_target(Quick CONDITION QT_FEATURE_quick_canvas
+qt_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
@@ -576,12 +576,12 @@ extend_target(Quick CONDITION QT_FEATURE_quick_canvas
         items/context2d/qquickcontext2dtile.cpp items/context2d/qquickcontext2dtile_p.h
 )
 
-extend_target(Quick CONDITION QT_FEATURE_wheelevent
+qt_extend_target(Quick CONDITION QT_FEATURE_wheelevent
     SOURCES
         handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h
         handlers/qquickwheelhandler_p_p.h
 )
-add_qt_docs(Quick
+qt_add_docs(Quick
     doc/qtquick.qdocconf
 )
 
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index 04dda812d0..0150c49161 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickShapes Module:
 #####################################################################
 
-add_qt_module(QuickShapes
+qt_add_module(QuickShapes
     INTERNAL_MODULE
     SOURCES
         qquickshape.cpp qquickshape_p.h
@@ -48,7 +48,7 @@ set(qtquickshapes_resource_files
     "shaders_ng/radialgradient.vert.qsb"
 )
 
-add_qt_resource(QuickShapes "qtquickshapes"
+qt_add_resource(QuickShapes "qtquickshapes"
     PREFIX
         "/qt-project.org/shapes"
     FILES
@@ -59,7 +59,7 @@ add_qt_resource(QuickShapes "qtquickshapes"
 ## Scopes:
 #####################################################################
 
-extend_target(QuickShapes CONDITION QT_FEATURE_opengl
+qt_extend_target(QuickShapes CONDITION QT_FEATURE_opengl
     SOURCES
         qquicknvprfunctions.cpp qquicknvprfunctions_p.h
         qquicknvprfunctions_p_p.h
diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt
index e39477020e..113e7cc71f 100644
--- a/src/quickwidgets/CMakeLists.txt
+++ b/src/quickwidgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QuickWidgets Module:
 #####################################################################
 
-add_qt_module(QuickWidgets
+qt_add_module(QuickWidgets
     SOURCES
         qquickwidget.cpp qquickwidget.h qquickwidget_p.h
         qtquickwidgetsglobal.h
author	Alexandru Croitor <alexandru.croitor@qt.io>	2019-11-14 13:31:06 +0100
committer	Alexandru Croitor <alexandru.croitor@qt.io>	2019-11-15 12:24:51 +0000
commit	ba494aaa24defe1401f621b791891e696b308756 (patch)
tree	3617f29e9625fafbf94609ac79b2decd4033107c /src
parent	91e32f86b53bb930405a58e19c84746ee85cdf89 (diff)