Regenerate projects

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

41 files changed, 148 insertions, 119 deletions

diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
new file mode 100644
index 00000000..1326798b
--- /dev/null
+++ b/.prev_CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from qtconnectivity.pro.
+
+cmake_minimum_required(VERSION 3.15.0)
+
+project(connectivity_FIXME
+    VERSION 6.0.0
+    DESCRIPTION "Qt connectivity_FIXME Libraries"
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C
+)
+
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
+
+if(NOT TARGET Qt::Network)
+    message(NOTICE "Skipping the build as the condition \"TARGET Qt::Network\" is not met.")
+    return()
+endif()
+if(ANDROID AND NOT TARGET Qt::AndroidExtras)
+    message(NOTICE "Skipping the build as the condition \"TARGET Qt::AndroidExtras OR NOT ANDROID\" is not met.")
+    return()
+endif()
+qt_build_repo()
diff --git a/src/android/nfc/.prev_CMakeLists.txt b/src/android/nfc/.prev_CMakeLists.txt
new file mode 100644
index 00000000..eb2c9930
--- /dev/null
+++ b/src/android/nfc/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from nfc.pro.
+
+qt_get_android_sdk_jar_for_api("android-18" android_sdk)
+
+set(java_sources
+    src/org/qtproject/qt5/android/nfc/QtNfc.java
+    src/org/qtproject/qt5/android/nfc/QtNfcBroadcastReceiver.java
+)
+
+add_jar(QtNfc
+    INCLUDE_JARS ${android_sdk}
+    SOURCES ${java_sources}
+)
+
+install_jar(QtNfc
+    DESTINATION jar
+    COMPONENT Devel
+)
+
diff --git a/src/android/nfc/CMakeLists.txt b/src/android/nfc/CMakeLists.txt
index 54bb0445..2e0b59ce 100644
--- a/src/android/nfc/CMakeLists.txt
+++ b/src/android/nfc/CMakeLists.txt
@@ -1,20 +1,18 @@
-# special case begin
-# This is a manually edited file
+# Generated from nfc.pro.
 
-set(path_prefix ${CMAKE_CURRENT_SOURCE_DIR}/src/org/qtproject/qt5/android/nfc)
+qt_get_android_sdk_jar_for_api("android-18" android_sdk)
 
 set(java_sources
-    ${path_prefix}/src/org/qtproject/qt5/android/nfc/QtNfc.java
-    ${path_prefix}/src/org/qtproject/qt5/android/nfc/QtNfcBroadcastReceiver.java
+    src/org/qtproject/qt5/android/nfc/QtNfc.java
+    src/org/qtproject/qt5/android/nfc/QtNfcBroadcastReceiver.java
 )
 
-add_jar(QtAndroidNfc
-    INCLUDE_JARS ${QT_ANDROID_JAR}
+add_jar(QtAndroidNfc # special case
+    INCLUDE_JARS ${android_sdk}
     SOURCES ${java_sources}
-    )
+)
 
-install_jar(QtAndroidNfc
+install_jar(QtAndroidNfc # special case
     DESTINATION jar
-    COMPONENT Devel)
-
-# special case end
+    COMPONENT Devel
+)
diff --git a/src/bluetooth/.prev_CMakeLists.txt b/src/bluetooth/.prev_CMakeLists.txt
index d5f7a426..95491c1f 100644
--- a/src/bluetooth/.prev_CMakeLists.txt
+++ b/src/bluetooth/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Bluetooth Module:
 #####################################################################
 
-add_qt_module(Bluetooth
+qt_add_module(Bluetooth
     SOURCES
         lecmaccalculator_p.h
         qbluetooth.cpp qbluetooth.h
@@ -47,7 +47,6 @@ add_qt_module(Bluetooth
 
 #### Keys ignored in scope 1:.:.:bluetooth.pro:<TRUE>:
 # OTHER_FILES = "doc/src/*.qdoc"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
@@ -56,7 +55,7 @@ add_qt_module(Bluetooth
 # WINDOWS_SDK_VERSION = "$$member($$list $$split WINDOWS_SDK_VERSION_STRING, . , 2)"
 # WINDOWS_SDK_VERSION_STRING = "$$(WindowsSDKVersion)"
 
-extend_target(Bluetooth CONDITION QT_FEATURE_bluez
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez
     SOURCES
         bluez/adapter.cpp bluez/adapter_p.h
         bluez/adapter1_bluez5.cpp bluez/adapter1_bluez5_p.h
@@ -103,7 +102,7 @@ extend_target(Bluetooth CONDITION QT_FEATURE_bluez
         Qt::Network
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
     SOURCES
         lecmaccalculator.cpp
         qleadvertiser_bluez.cpp
@@ -111,12 +110,12 @@ extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
         qlowenergycontroller_bluezdbus.cpp qlowenergycontroller_bluezdbus_p.h
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le AND QT_FEATURE_linux_crypto_api
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le AND QT_FEATURE_linux_crypto_api
     DEFINES
         CONFIG_LINUX_CRYPTO_API
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND NOT QT_FEATURE_bluez_le
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND NOT QT_FEATURE_bluez_le
     SOURCES
         dummy/dummy_helper.cpp dummy/dummy_helper_p.h
         qlowenergycontroller_dummy.cpp qlowenergycontroller_dummy_p.h
@@ -133,7 +132,7 @@ if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED))
     )
 endif()
 
-extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_bluez
+qt_extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_bluez
     SOURCES
         android/androidbroadcastreceiver.cpp android/androidbroadcastreceiver_p.h
         android/devicediscoverybroadcastreceiver.cpp android/devicediscoverybroadcastreceiver_p.h
@@ -157,7 +156,7 @@ extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FE
         Qt::CorePrivate
 )
 
-extend_target(Bluetooth CONDITION APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         darwin/btcentralmanager.mm darwin/btcentralmanager_p.h
         darwin/btconnectionmonitor.mm darwin/btconnectionmonitor_p.h
@@ -193,7 +192,7 @@ extend_target(Bluetooth CONDITION APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROI
         Qt::Concurrent
 )
 
-extend_target(Bluetooth CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (APPLE_IOS OR APPLE_TVOS) AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (APPLE_IOS OR APPLE_TVOS) AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         darwin/btcentralmanager.mm darwin/btcentralmanager_p.h
         darwin/btdelegates.cpp darwin/btdelegates_p.h
@@ -217,12 +216,12 @@ extend_target(Bluetooth CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (AP
         ${FWFoundation}
 )
 
-extend_target(Bluetooth CONDITION APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         darwin/btperipheralmanager.mm darwin/btperipheralmanager_p.h
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         qbluetoothdevicediscoveryagent_winrt.cpp
         qbluetoothlocaldevice_winrt.cpp
@@ -240,7 +239,7 @@ extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT
         Qt::Core
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT WINRT AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT WINRT AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         qbluetoothutils_win.cpp
     DEFINES
@@ -250,18 +249,18 @@ extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT
         user32.lib
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_FEATURE_winrt_btle_no_pairing AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_FEATURE_winrt_btle_no_pairing AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         qlowenergycontroller_winrt_new.cpp qlowenergycontroller_winrt_new_p.h
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_WINDOWS_SDK_VERSION STRLESS 14393 AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_WINDOWS_SDK_VERSION STRLESS 14393 AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
     DEFINES
         QT_UCRTVERSION=
         QT_WINRT_LIMITED_SERVICEDISCOVERY
 )
 
-extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         qbluetoothdevicediscoveryagent_win.cpp
         qbluetoothlocaldevice_win.cpp
@@ -281,7 +280,7 @@ extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEAT
         ws2_32
 )
 
-extend_target(Bluetooth CONDITION UNIX AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION UNIX AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         dummy/dummy_helper.cpp dummy/dummy_helper_p.h
         qbluetoothdevicediscoveryagent_p.cpp
@@ -295,7 +294,7 @@ extend_target(Bluetooth CONDITION UNIX AND NOT APPLE_IOS AND NOT APPLE_OSX AND N
 
 #### Keys ignored in scope 21:.:.:bluetooth.pro:WINRT:
 # MODULE_WINRT_CAPABILITIES_DEVICE = "bluetooth.genericAttributeProfile" "bluetooth.rfcomm"
-add_qt_docs(Bluetooth
+qt_add_docs(Bluetooth
     doc/qtbluetooth.qdocconf
 )
 
diff --git a/src/bluetooth/CMakeLists.txt b/src/bluetooth/CMakeLists.txt
index b9015cc6..79914aa6 100644
--- a/src/bluetooth/CMakeLists.txt
+++ b/src/bluetooth/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Bluetooth Module:
 #####################################################################
 
-add_qt_module(Bluetooth
+qt_add_module(Bluetooth
     SOURCES
         lecmaccalculator_p.h
         qbluetooth.cpp qbluetooth.h
@@ -47,7 +47,6 @@ add_qt_module(Bluetooth
 
 #### Keys ignored in scope 1:.:.:bluetooth.pro:<TRUE>:
 # OTHER_FILES = "doc/src/*.qdoc"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
@@ -73,7 +72,7 @@ extend_target(Bluetooth CONDITION WIN32 AND WINDOWS_SDK_VERSION LESS 14393
 )
 # special case end
 
-extend_target(Bluetooth CONDITION QT_FEATURE_bluez
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez
     SOURCES
         bluez/adapter.cpp bluez/adapter_p.h
         bluez/adapter1_bluez5.cpp bluez/adapter1_bluez5_p.h
@@ -120,7 +119,7 @@ extend_target(Bluetooth CONDITION QT_FEATURE_bluez
         Qt::Network
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
     SOURCES
         lecmaccalculator.cpp
         qleadvertiser_bluez.cpp
@@ -128,12 +127,12 @@ extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
         qlowenergycontroller_bluezdbus.cpp qlowenergycontroller_bluezdbus_p.h
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le AND QT_FEATURE_linux_crypto_api
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le AND QT_FEATURE_linux_crypto_api
     DEFINES
         CONFIG_LINUX_CRYPTO_API
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND NOT QT_FEATURE_bluez_le
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND NOT QT_FEATURE_bluez_le
     SOURCES
         dummy/dummy_helper.cpp dummy/dummy_helper_p.h
         qlowenergycontroller_dummy.cpp qlowenergycontroller_dummy_p.h
@@ -150,7 +149,7 @@ if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED))
     )
 endif()
 
-extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_bluez
+qt_extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_bluez
     SOURCES
         android/androidbroadcastreceiver.cpp android/androidbroadcastreceiver_p.h
         android/devicediscoverybroadcastreceiver.cpp android/devicediscoverybroadcastreceiver_p.h
@@ -174,7 +173,7 @@ extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FE
         Qt::CorePrivate
 )
 
-extend_target(Bluetooth CONDITION APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         darwin/btcentralmanager.mm darwin/btcentralmanager_p.h
         darwin/btconnectionmonitor.mm darwin/btconnectionmonitor_p.h
@@ -210,7 +209,7 @@ extend_target(Bluetooth CONDITION APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROI
         Qt::Concurrent
 )
 
-extend_target(Bluetooth CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (APPLE_IOS OR APPLE_TVOS) AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (APPLE_IOS OR APPLE_TVOS) AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         darwin/btcentralmanager.mm darwin/btcentralmanager_p.h
         darwin/btdelegates.cpp darwin/btdelegates_p.h
@@ -234,12 +233,12 @@ extend_target(Bluetooth CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (AP
         ${FWFoundation}
 )
 
-extend_target(Bluetooth CONDITION APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         darwin/btperipheralmanager.mm darwin/btperipheralmanager_p.h
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         qbluetoothdevicediscoveryagent_winrt.cpp
         qbluetoothlocaldevice_winrt.cpp
@@ -257,7 +256,7 @@ extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT
         Qt::Core
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT WINRT AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT WINRT AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         qbluetoothutils_win.cpp
     DEFINES
@@ -267,21 +266,20 @@ extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT
         user32.lib
 )
 
-extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_FEATURE_winrt_btle_no_pairing AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_FEATURE_winrt_btle_no_pairing AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         qlowenergycontroller_winrt_new.cpp qlowenergycontroller_winrt_new_p.h
 )
 
-
 # special case begin
-# extend_target(Bluetooth CONDITION (((((NOT (QT_FEATURE_bluez)) AND (NOT (ANDROID AND NOT ANDROID_EMBEDDED))) AND (NOT (APPLE_OSX))) AND (NOT (APPLE_IOS OR APPLE_TVOS))) AND (QT_FEATURE_winrt_bt)) AND (lessThan(WINDOWS_SDK_VERSION, 14393))
+#qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_WINDOWS_SDK_VERSION STRLESS 14393 AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
 #    DEFINES
 #        QT_UCRTVERSION=
 #        QT_WINRT_LIMITED_SERVICEDISCOVERY
 #)
 # special case end
 
-extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         qbluetoothdevicediscoveryagent_win.cpp
         qbluetoothlocaldevice_win.cpp
@@ -301,7 +299,7 @@ extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEAT
         ws2_32
 )
 
-extend_target(Bluetooth CONDITION UNIX AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
+qt_extend_target(Bluetooth CONDITION UNIX AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         dummy/dummy_helper.cpp dummy/dummy_helper_p.h
         qbluetoothdevicediscoveryagent_p.cpp
@@ -315,7 +313,7 @@ extend_target(Bluetooth CONDITION UNIX AND NOT APPLE_IOS AND NOT APPLE_OSX AND N
 
 #### Keys ignored in scope 19:.:.:bluetooth.pro:WINRT:
 # MODULE_WINRT_CAPABILITIES_DEVICE = "bluetooth.genericAttributeProfile" "bluetooth.rfcomm"
-add_qt_docs(Bluetooth
+qt_add_docs(Bluetooth
     doc/qtbluetooth.qdocconf
 )
 
diff --git a/src/imports/bluetooth/.prev_CMakeLists.txt b/src/imports/bluetooth/.prev_CMakeLists.txt
index bd37eb54..ce3aff13 100644
--- a/src/imports/bluetooth/.prev_CMakeLists.txt
+++ b/src/imports/bluetooth/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## bluetooth Plugin:
 #####################################################################
 
-add_qml_module(bluetooth
+qt_add_qml_module(bluetooth
     URI "QtBluetooth"
     CLASSNAME QBluetoothQmlPlugin
     SKIP_TYPE_REGISTRATION
@@ -23,4 +23,3 @@ add_qml_module(bluetooth
 
 #### Keys ignored in scope 1:.:.:bluetooth.pro:<TRUE>:
 # TARGETPATH = "QtBluetooth"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/bluetooth/CMakeLists.txt b/src/imports/bluetooth/CMakeLists.txt
index 4663368d..7db86634 100644
--- a/src/imports/bluetooth/CMakeLists.txt
+++ b/src/imports/bluetooth/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## bluetooth Plugin:
 #####################################################################
 
-add_qml_module(declarative_bluetooth # special case
+qt_add_qml_module(declarative_bluetooth # special case
     URI "QtBluetooth"
     CLASSNAME QBluetoothQmlPlugin
     SKIP_TYPE_REGISTRATION
@@ -23,4 +23,3 @@ add_qml_module(declarative_bluetooth # special case
 
 #### Keys ignored in scope 1:.:.:bluetooth.pro:<TRUE>:
 # TARGETPATH = "QtBluetooth"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/nfc/.prev_CMakeLists.txt b/src/imports/nfc/.prev_CMakeLists.txt
index 549747cd..ebf513bb 100644
--- a/src/imports/nfc/.prev_CMakeLists.txt
+++ b/src/imports/nfc/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nfc Plugin:
 #####################################################################
 
-add_qml_module(nfc
+qt_add_qml_module(nfc
     URI "QtNfc"
     CLASSNAME QNfcQmlPlugin
     SKIP_TYPE_REGISTRATION
@@ -23,4 +23,3 @@ add_qml_module(nfc
 
 #### Keys ignored in scope 1:.:.:nfc.pro:<TRUE>:
 # TARGETPATH = "QtNfc"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/nfc/CMakeLists.txt b/src/imports/nfc/CMakeLists.txt
index af93521e..f567ce2f 100644
--- a/src/imports/nfc/CMakeLists.txt
+++ b/src/imports/nfc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nfc Plugin:
 #####################################################################
 
-add_qml_module(declarative_nfc # special case
+qt_add_qml_module(declarative_nfc # special case
     URI "QtNfc"
     CLASSNAME QNfcQmlPlugin
     SKIP_TYPE_REGISTRATION
@@ -23,4 +23,3 @@ add_qml_module(declarative_nfc # special case
 
 #### Keys ignored in scope 1:.:.:nfc.pro:<TRUE>:
 # TARGETPATH = "QtNfc"
-# _LOADED = "qml_plugin"
diff --git a/src/nfc/.prev_CMakeLists.txt b/src/nfc/.prev_CMakeLists.txt
index a8c05e36..b675a1a3 100644
--- a/src/nfc/.prev_CMakeLists.txt
+++ b/src/nfc/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Nfc Module:
 #####################################################################
 
-add_qt_module(Nfc
+qt_add_module(Nfc
     SOURCES
         qllcpserver.cpp qllcpserver_p.h
         qllcpsocket.cpp qllcpsocket_p.h
@@ -34,12 +34,11 @@ add_qt_module(Nfc
 
 #### Keys ignored in scope 1:.:.:nfc.pro:<TRUE>:
 # OTHER_FILES = "doc/src/*.qdoc"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(Nfc CONDITION LINUX AND TARGET Qt::DBus
+qt_extend_target(Nfc CONDITION LINUX AND TARGET Qt::DBus
     SOURCES
         neard/adapter.cpp neard/adapter_p.h
         neard/agent.cpp neard/agent_p.h
@@ -74,7 +73,7 @@ if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED))
     )
 endif()
 
-extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED
+qt_extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED
     SOURCES
         android/androidjninfc.cpp android/androidjninfc_p.h
         android/androidmainnewintentlistener.cpp android/androidmainnewintentlistener_p.h
@@ -96,7 +95,7 @@ extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED
 #### Keys ignored in scope 4:.:.:nfc.pro:ANDROID AND NOT ANDROID_EMBEDDED:
 # NFC_BACKEND_AVAILABLE = "yes"
 
-extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY
+qt_extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY
     SOURCES
         qllcpserver_p.cpp
         qllcpserver_p_p.h
@@ -107,7 +106,7 @@ extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY
         qnearfieldsharetargetimpl_p.cpp qnearfieldsharetargetimpl_p.h
         qnearfieldtarget_p.cpp
 )
-add_qt_docs(Nfc
+qt_add_docs(Nfc
     doc/qtnfc.qdocconf
 )
 
diff --git a/src/nfc/CMakeLists.txt b/src/nfc/CMakeLists.txt
index 6ab92cda..108151bb 100644
--- a/src/nfc/CMakeLists.txt
+++ b/src/nfc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Nfc Module:
 #####################################################################
 
-add_qt_module(Nfc
+qt_add_module(Nfc
     SOURCES
         qllcpserver.cpp qllcpserver_p.h
         qllcpsocket.cpp qllcpsocket_p.h
@@ -34,12 +34,11 @@ add_qt_module(Nfc
 
 #### Keys ignored in scope 1:.:.:nfc.pro:<TRUE>:
 # OTHER_FILES = "doc/src/*.qdoc"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(Nfc CONDITION LINUX AND TARGET Qt::DBus
+qt_extend_target(Nfc CONDITION LINUX AND TARGET Qt::DBus
     SOURCES
         neard/adapter.cpp neard/adapter_p.h
         neard/agent.cpp neard/agent_p.h
@@ -81,7 +80,7 @@ if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED))
     set(NFC_BACKEND_AVAILABLE ON) # special case
 endif()
 
-extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED
+qt_extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED
     SOURCES
         android/androidjninfc.cpp android/androidjninfc_p.h
         android/androidmainnewintentlistener.cpp android/androidmainnewintentlistener_p.h
@@ -104,8 +103,8 @@ extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED
 # NFC_BACKEND_AVAILABLE = "yes"
 
 # special case begin
-# extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY
-extend_target(Nfc CONDITION NOT NFC_BACKEND_AVAILABLE
+# qt_extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY
+qt_extend_target(Nfc CONDITION NOT NFC_BACKEND_AVAILABLE
 # special case end
     SOURCES
         qllcpserver_p.cpp
@@ -117,7 +116,7 @@ extend_target(Nfc CONDITION NOT NFC_BACKEND_AVAILABLE
         qnearfieldsharetargetimpl_p.cpp qnearfieldsharetargetimpl_p.h
         qnearfieldtarget_p.cpp
 )
-add_qt_docs(Nfc
+qt_add_docs(Nfc
     doc/qtnfc.qdocconf
 )
 
diff --git a/src/tools/sdpscanner/.prev_CMakeLists.txt b/src/tools/sdpscanner/.prev_CMakeLists.txt
index d9cd9843..11b8f35f 100644
--- a/src/tools/sdpscanner/.prev_CMakeLists.txt
+++ b/src/tools/sdpscanner/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sdpscanner Tool:
 #####################################################################
 
-add_qt_tool(sdpscanner
+qt_add_tool(sdpscanner
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,6 @@ add_qt_tool(sdpscanner
 #### Keys ignored in scope 1:.:.:sdpscanner.pro:<TRUE>:
 # QT_FOR_CONFIG = "bluetooth-private"
 # TEMPLATE = "app"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
diff --git a/src/tools/sdpscanner/CMakeLists.txt b/src/tools/sdpscanner/CMakeLists.txt
index 71bc3c77..ef3fbbca 100644
--- a/src/tools/sdpscanner/CMakeLists.txt
+++ b/src/tools/sdpscanner/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sdpscanner Tool:
 #####################################################################
 
-add_qt_tool(sdpscanner
+qt_add_tool(sdpscanner
     TOOLS_TARGET Bluetooth # special case
     SOURCES
         main.cpp
@@ -15,7 +15,6 @@ add_qt_tool(sdpscanner
 #### Keys ignored in scope 1:.:.:sdpscanner.pro:<TRUE>:
 # QT_FOR_CONFIG = "bluetooth-private"
 # TEMPLATE = "app"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
diff --git a/tests/auto/qbluetoothaddress/CMakeLists.txt b/tests/auto/qbluetoothaddress/CMakeLists.txt
index d68c7175..6b33ceab 100644
--- a/tests/auto/qbluetoothaddress/CMakeLists.txt
+++ b/tests/auto/qbluetoothaddress/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothaddress Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothaddress
+qt_add_test(tst_qbluetoothaddress
     SOURCES
         tst_qbluetoothaddress.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt b/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt
index c4abae38..309b1213 100644
--- a/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt
+++ b/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothdevicediscoveryagent Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothdevicediscoveryagent
+qt_add_test(tst_qbluetoothdevicediscoveryagent
     SOURCES
         tst_qbluetoothdevicediscoveryagent.cpp
     LIBRARIES
@@ -17,7 +17,7 @@ add_qt_test(tst_qbluetoothdevicediscoveryagent
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qbluetoothdevicediscoveryagent CONDITION APPLE_OSX
+qt_extend_target(tst_qbluetoothdevicediscoveryagent CONDITION APPLE_OSX
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/qbluetoothdeviceinfo/CMakeLists.txt b/tests/auto/qbluetoothdeviceinfo/CMakeLists.txt
index b5e1b806..06ab7753 100644
--- a/tests/auto/qbluetoothdeviceinfo/CMakeLists.txt
+++ b/tests/auto/qbluetoothdeviceinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothdeviceinfo Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothdeviceinfo
+qt_add_test(tst_qbluetoothdeviceinfo
     SOURCES
         tst_qbluetoothdeviceinfo.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qbluetoothhostinfo/CMakeLists.txt b/tests/auto/qbluetoothhostinfo/CMakeLists.txt
index f179b509..093951ea 100644
--- a/tests/auto/qbluetoothhostinfo/CMakeLists.txt
+++ b/tests/auto/qbluetoothhostinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothhostinfo Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothhostinfo
+qt_add_test(tst_qbluetoothhostinfo
     SOURCES
         tst_qbluetoothhostinfo.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qbluetoothlocaldevice/CMakeLists.txt b/tests/auto/qbluetoothlocaldevice/CMakeLists.txt
index 4ecba8fc..841bcdfc 100644
--- a/tests/auto/qbluetoothlocaldevice/CMakeLists.txt
+++ b/tests/auto/qbluetoothlocaldevice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothlocaldevice Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothlocaldevice
+qt_add_test(tst_qbluetoothlocaldevice
     SOURCES
         tst_qbluetoothlocaldevice.cpp
     LIBRARIES
@@ -17,7 +17,7 @@ add_qt_test(tst_qbluetoothlocaldevice
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qbluetoothlocaldevice CONDITION APPLE_OSX
+qt_extend_target(tst_qbluetoothlocaldevice CONDITION APPLE_OSX
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/qbluetoothserver/CMakeLists.txt b/tests/auto/qbluetoothserver/CMakeLists.txt
index 1f1cc14e..72444957 100644
--- a/tests/auto/qbluetoothserver/CMakeLists.txt
+++ b/tests/auto/qbluetoothserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothserver Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothserver
+qt_add_test(tst_qbluetoothserver
     SOURCES
         tst_qbluetoothserver.cpp
     LIBRARIES
@@ -20,7 +20,7 @@ add_qt_test(tst_qbluetoothserver
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qbluetoothserver CONDITION APPLE_OSX
+qt_extend_target(tst_qbluetoothserver CONDITION APPLE_OSX
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/qbluetoothservicediscoveryagent/CMakeLists.txt b/tests/auto/qbluetoothservicediscoveryagent/CMakeLists.txt
index 81a8d769..710bf268 100644
--- a/tests/auto/qbluetoothservicediscoveryagent/CMakeLists.txt
+++ b/tests/auto/qbluetoothservicediscoveryagent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothservicediscoveryagent Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothservicediscoveryagent
+qt_add_test(tst_qbluetoothservicediscoveryagent
     SOURCES
         tst_qbluetoothservicediscoveryagent.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ add_qt_test(tst_qbluetoothservicediscoveryagent
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qbluetoothservicediscoveryagent CONDITION APPLE_OSX
+qt_extend_target(tst_qbluetoothservicediscoveryagent CONDITION APPLE_OSX
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/qbluetoothserviceinfo/CMakeLists.txt b/tests/auto/qbluetoothserviceinfo/CMakeLists.txt
index afdf580a..bee36bd9 100644
--- a/tests/auto/qbluetoothserviceinfo/CMakeLists.txt
+++ b/tests/auto/qbluetoothserviceinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothserviceinfo Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothserviceinfo
+qt_add_test(tst_qbluetoothserviceinfo
     SOURCES
         tst_qbluetoothserviceinfo.cpp
     PUBLIC_LIBRARIES
@@ -15,12 +15,12 @@ add_qt_test(tst_qbluetoothserviceinfo
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qbluetoothserviceinfo CONDITION APPLE_OSX
+qt_extend_target(tst_qbluetoothserviceinfo CONDITION APPLE_OSX
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(tst_qbluetoothserviceinfo CONDITION ANDROID AND NOT ANDROID_EMBEDDED
+qt_extend_target(tst_qbluetoothserviceinfo CONDITION ANDROID AND NOT ANDROID_EMBEDDED
     DEFINES
         QT_ANDROID_BLUETOOTH
 )
diff --git a/tests/auto/qbluetoothsocket/CMakeLists.txt b/tests/auto/qbluetoothsocket/CMakeLists.txt
index 3f6cba5f..febf1920 100644
--- a/tests/auto/qbluetoothsocket/CMakeLists.txt
+++ b/tests/auto/qbluetoothsocket/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothsocket Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothsocket
+qt_add_test(tst_qbluetoothsocket
     SOURCES
         tst_qbluetoothsocket.cpp
     LIBRARIES
@@ -22,14 +22,14 @@ add_qt_test(tst_qbluetoothsocket
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qbluetoothsocket CONDITION APPLE_OSX
+qt_extend_target(tst_qbluetoothsocket CONDITION APPLE_OSX
     DEFINES
         QT_OSX_BLUETOOTH
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(tst_qbluetoothsocket CONDITION ANDROID AND NOT ANDROID_EMBEDDED
+qt_extend_target(tst_qbluetoothsocket CONDITION ANDROID AND NOT ANDROID_EMBEDDED
     DEFINES
         QT_ANDROID_BLUETOOTH
 )
diff --git a/tests/auto/qbluetoothtransfermanager/CMakeLists.txt b/tests/auto/qbluetoothtransfermanager/CMakeLists.txt
index 24a05742..7856334d 100644
--- a/tests/auto/qbluetoothtransfermanager/CMakeLists.txt
+++ b/tests/auto/qbluetoothtransfermanager/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     *.txt)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qbluetoothtransfermanager
+qt_add_test(tst_qbluetoothtransfermanager
     SOURCES
         tst_qbluetoothtransfermanager.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qbluetoothtransferrequest/CMakeLists.txt b/tests/auto/qbluetoothtransferrequest/CMakeLists.txt
index a3ad2a4a..90cf0411 100644
--- a/tests/auto/qbluetoothtransferrequest/CMakeLists.txt
+++ b/tests/auto/qbluetoothtransferrequest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothtransferrequest Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothtransferrequest
+qt_add_test(tst_qbluetoothtransferrequest
     SOURCES
         tst_qbluetoothtransferrequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qbluetoothuuid/CMakeLists.txt b/tests/auto/qbluetoothuuid/CMakeLists.txt
index f69d8418..76e387a6 100644
--- a/tests/auto/qbluetoothuuid/CMakeLists.txt
+++ b/tests/auto/qbluetoothuuid/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbluetoothuuid Test:
 #####################################################################
 
-add_qt_test(tst_qbluetoothuuid
+qt_add_test(tst_qbluetoothuuid
     SOURCES
         tst_qbluetoothuuid.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qlowenergycharacteristic/CMakeLists.txt b/tests/auto/qlowenergycharacteristic/CMakeLists.txt
index da1381f9..d145c248 100644
--- a/tests/auto/qlowenergycharacteristic/CMakeLists.txt
+++ b/tests/auto/qlowenergycharacteristic/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlowenergycharacteristic Test:
 #####################################################################
 
-add_qt_test(tst_qlowenergycharacteristic
+qt_add_test(tst_qlowenergycharacteristic
     SOURCES
         tst_qlowenergycharacteristic.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qlowenergycontroller-gattserver/server/.prev_CMakeLists.txt b/tests/auto/qlowenergycontroller-gattserver/server/.prev_CMakeLists.txt
index d19f54cb..6a618333 100644
--- a/tests/auto/qlowenergycontroller-gattserver/server/.prev_CMakeLists.txt
+++ b/tests/auto/qlowenergycontroller-gattserver/server/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## server Binary:
 #####################################################################
 
-add_qt_executable(server
+qt_add_executable(server
     GUI
     SOURCES
         qlowenergycontroller-gattserver.cpp
diff --git a/tests/auto/qlowenergycontroller-gattserver/server/CMakeLists.txt b/tests/auto/qlowenergycontroller-gattserver/server/CMakeLists.txt
index 567a6cda..485428f1 100644
--- a/tests/auto/qlowenergycontroller-gattserver/server/CMakeLists.txt
+++ b/tests/auto/qlowenergycontroller-gattserver/server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## server Binary:
 #####################################################################
 
-add_qt_executable(server
+qt_add_executable(server
     GUI
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt b/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt
index 373a888d..8720bdc5 100644
--- a/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt
+++ b/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlowenergycontroller-gattserver Test:
 #####################################################################
 
-add_qt_test(tst_qlowenergycontroller-gattserver
+qt_add_test(tst_qlowenergycontroller-gattserver
     SOURCES
         tst_qlowenergycontroller-gattserver.cpp
     LIBRARIES
@@ -16,17 +16,17 @@ add_qt_test(tst_qlowenergycontroller-gattserver
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qlowenergycontroller-gattserver CONDITION QT_FEATURE_linux_crypto_api
+qt_extend_target(tst_qlowenergycontroller-gattserver CONDITION QT_FEATURE_linux_crypto_api
     DEFINES
         CONFIG_LINUX_CRYPTO_API
 )
 
-extend_target(tst_qlowenergycontroller-gattserver CONDITION QT_FEATURE_bluez_le
+qt_extend_target(tst_qlowenergycontroller-gattserver CONDITION QT_FEATURE_bluez_le
     DEFINES
         CONFIG_BLUEZ_LE
 )
 
-extend_target(tst_qlowenergycontroller-gattserver CONDITION boot2qt
+qt_extend_target(tst_qlowenergycontroller-gattserver CONDITION boot2qt
     DEFINES
         CHECK_CMAC_SUPPORT
 )
diff --git a/tests/auto/qlowenergycontroller/CMakeLists.txt b/tests/auto/qlowenergycontroller/CMakeLists.txt
index 908a7783..bfa973a1 100644
--- a/tests/auto/qlowenergycontroller/CMakeLists.txt
+++ b/tests/auto/qlowenergycontroller/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlowenergycontroller Test:
 #####################################################################
 
-add_qt_test(tst_qlowenergycontroller
+qt_add_test(tst_qlowenergycontroller
     SOURCES
         tst_qlowenergycontroller.cpp
     LIBRARIES
@@ -16,12 +16,12 @@ add_qt_test(tst_qlowenergycontroller
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qlowenergycontroller CONDITION ANDROID
+qt_extend_target(tst_qlowenergycontroller CONDITION ANDROID
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(tst_qlowenergycontroller CONDITION APPLE_IOS OR APPLE_OSX
+qt_extend_target(tst_qlowenergycontroller CONDITION APPLE_IOS OR APPLE_OSX
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/qlowenergydescriptor/CMakeLists.txt b/tests/auto/qlowenergydescriptor/CMakeLists.txt
index 0f5d2a1e..e80f0f76 100644
--- a/tests/auto/qlowenergydescriptor/CMakeLists.txt
+++ b/tests/auto/qlowenergydescriptor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlowenergydescriptor Test:
 #####################################################################
 
-add_qt_test(tst_qlowenergydescriptor
+qt_add_test(tst_qlowenergydescriptor
     SOURCES
         tst_qlowenergydescriptor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qlowenergyservice/CMakeLists.txt b/tests/auto/qlowenergyservice/CMakeLists.txt
index 350b5825..55f7ea62 100644
--- a/tests/auto/qlowenergyservice/CMakeLists.txt
+++ b/tests/auto/qlowenergyservice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlowenergyservice Test:
 #####################################################################
 
-add_qt_test(tst_qlowenergyservice
+qt_add_test(tst_qlowenergyservice
     SOURCES
         tst_qlowenergyservice.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qndefmessage/CMakeLists.txt b/tests/auto/qndefmessage/CMakeLists.txt
index c237cd05..da1254cc 100644
--- a/tests/auto/qndefmessage/CMakeLists.txt
+++ b/tests/auto/qndefmessage/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qndefmessage Test:
 #####################################################################
 
-add_qt_test(tst_qndefmessage
+qt_add_test(tst_qndefmessage
     SOURCES
         tst_qndefmessage.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qndefnfcsmartposterrecord/CMakeLists.txt b/tests/auto/qndefnfcsmartposterrecord/CMakeLists.txt
index b804462a..10b23f15 100644
--- a/tests/auto/qndefnfcsmartposterrecord/CMakeLists.txt
+++ b/tests/auto/qndefnfcsmartposterrecord/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qndefnfcsmartposterrecord Test:
 #####################################################################
 
-add_qt_test(tst_qndefnfcsmartposterrecord
+qt_add_test(tst_qndefnfcsmartposterrecord
     SOURCES
         tst_qndefnfcsmartposterrecord.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qndefrecord/CMakeLists.txt b/tests/auto/qndefrecord/CMakeLists.txt
index b9e0fed1..f643b8e0 100644
--- a/tests/auto/qndefrecord/CMakeLists.txt
+++ b/tests/auto/qndefrecord/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qndefrecord Test:
 #####################################################################
 
-add_qt_test(tst_qndefrecord
+qt_add_test(tst_qndefrecord
     SOURCES
         tst_qndefrecord.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt b/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt
index 529bbe42..e1e64ae0 100644
--- a/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt
+++ b/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata/Qt Labs Website Tag Type1.nfc")
 list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata/Qt Website Tag Type1.nfc")
 
-add_qt_test(tst_qnearfieldmanager
+qt_add_test(tst_qnearfieldmanager
     SOURCES
         ../../../src/nfc/qnearfieldmanager_emulator.cpp ../../../src/nfc/qnearfieldmanager_emulator_p.h
         ../../../src/nfc/qnearfieldmanagervirtualbase.cpp ../../../src/nfc/qnearfieldmanagervirtualbase_p.h
@@ -36,7 +36,7 @@ add_qt_test(tst_qnearfieldmanager
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qnearfieldmanager CONDITION builtin_testdata
+qt_extend_target(tst_qnearfieldmanager CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/qnearfieldmanager/CMakeLists.txt b/tests/auto/qnearfieldmanager/CMakeLists.txt
index 65bafcb2..3b001903 100644
--- a/tests/auto/qnearfieldmanager/CMakeLists.txt
+++ b/tests/auto/qnearfieldmanager/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 list(APPEND test_data "../nfcdata/Qt Labs Website Tag Type1.nfc") # special case
 list(APPEND test_data "../nfcdata/Qt Website Tag Type1.nfc") # special case
 
-add_qt_test(tst_qnearfieldmanager
+qt_add_test(tst_qnearfieldmanager
     SOURCES
         ../../../src/nfc/qnearfieldmanager_emulator.cpp ../../../src/nfc/qnearfieldmanager_emulator_p.h
         ../../../src/nfc/qnearfieldmanagervirtualbase.cpp ../../../src/nfc/qnearfieldmanagervirtualbase_p.h
@@ -38,7 +38,7 @@ add_qt_test(tst_qnearfieldmanager
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qnearfieldmanager CONDITION builtin_testdata
+qt_extend_target(tst_qnearfieldmanager CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt b/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt
index 960de318..bb449175 100644
--- a/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt
+++ b/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata/Qt Labs Website Tag Type1.nfc")
 list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata/Qt Website Tag Type1.nfc")
 
-add_qt_test(tst_qnearfieldtagtype1
+qt_add_test(tst_qnearfieldtagtype1
     SOURCES
         ../../../src/nfc/qnearfieldmanager_emulator.cpp ../../../src/nfc/qnearfieldmanager_emulator_p.h
         ../../../src/nfc/qnearfieldmanagervirtualbase.cpp ../../../src/nfc/qnearfieldmanagervirtualbase_p.h
@@ -36,7 +36,7 @@ add_qt_test(tst_qnearfieldtagtype1
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qnearfieldtagtype1 CONDITION builtin_testdata
+qt_extend_target(tst_qnearfieldtagtype1 CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/qnearfieldtagtype1/CMakeLists.txt b/tests/auto/qnearfieldtagtype1/CMakeLists.txt
index a97eafaf..c05f645d 100644
--- a/tests/auto/qnearfieldtagtype1/CMakeLists.txt
+++ b/tests/auto/qnearfieldtagtype1/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 list(APPEND test_data "../nfcdata/Qt Labs Website Tag Type1.nfc") # special case
 list(APPEND test_data "../nfcdata/Qt Website Tag Type1.nfc") # special case
 
-add_qt_test(tst_qnearfieldtagtype1
+qt_add_test(tst_qnearfieldtagtype1
     SOURCES
         ../../../src/nfc/qnearfieldmanager_emulator.cpp ../../../src/nfc/qnearfieldmanager_emulator_p.h
         ../../../src/nfc/qnearfieldmanagervirtualbase.cpp ../../../src/nfc/qnearfieldmanagervirtualbase_p.h
@@ -38,7 +38,7 @@ add_qt_test(tst_qnearfieldtagtype1
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qnearfieldtagtype1 CONDITION builtin_testdata
+qt_extend_target(tst_qnearfieldtagtype1 CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt b/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt
index 53324e32..a337d3ed 100644
--- a/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt
+++ b/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/nfcdata/Dynamic Empty Tag.nfc")
 list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/nfcdata/Empty Tag.nfc")
 
-add_qt_test(tst_qnearfieldtagtype2
+qt_add_test(tst_qnearfieldtagtype2
     SOURCES
         ../../../src/nfc/qnearfieldmanager_emulator.cpp ../../../src/nfc/qnearfieldmanager_emulator_p.h
         ../../../src/nfc/qnearfieldmanagervirtualbase.cpp ../../../src/nfc/qnearfieldmanagervirtualbase_p.h
@@ -36,7 +36,7 @@ add_qt_test(tst_qnearfieldtagtype2
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qnearfieldtagtype2 CONDITION builtin_testdata
+qt_extend_target(tst_qnearfieldtagtype2 CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/qnearfieldtagtype2/CMakeLists.txt b/tests/auto/qnearfieldtagtype2/CMakeLists.txt
index 785ac1d4..bcc921d3 100644
--- a/tests/auto/qnearfieldtagtype2/CMakeLists.txt
+++ b/tests/auto/qnearfieldtagtype2/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 list(APPEND test_data "nfcdata/Dynamic Empty Tag.nfc") # special case
 list(APPEND test_data "nfcdata/Empty Tag.nfc") # special case
 
-add_qt_test(tst_qnearfieldtagtype2
+qt_add_test(tst_qnearfieldtagtype2
     SOURCES
         ../../../src/nfc/qnearfieldmanager_emulator.cpp ../../../src/nfc/qnearfieldmanager_emulator_p.h
         ../../../src/nfc/qnearfieldmanagervirtualbase.cpp ../../../src/nfc/qnearfieldmanagervirtualbase_p.h
@@ -38,7 +38,7 @@ add_qt_test(tst_qnearfieldtagtype2
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qnearfieldtagtype2 CONDITION builtin_testdata
+qt_extend_target(tst_qnearfieldtagtype2 CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )