Fix top-level build

Use CMake API level 3 to avoid function name clashes with
qt_add_qml_module from qtdeclarative when doing a top-level build.

Fixes: QTBUG-91256
Pick-to: 6.1 6.0
Change-Id: I5cce0d94f655c738e2bb097ef85f408aa4f020a5
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

6 files changed, 26 insertions, 27 deletions

diff --git a/src/imports/opcua/.prev_CMakeLists.txt b/src/imports/opcua/.prev_CMakeLists.txt
index 9334c75..2279651 100644
--- a/src/imports/opcua/.prev_CMakeLists.txt
+++ b/src/imports/opcua/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## opcua Plugin:
 #####################################################################
 
-qt_add_qml_module(opcua
+qt_internal_add_qml_module(opcua
     VERSION "1.0"
     CLASSNAME OpcUaPlugin
     SKIP_TYPE_REGISTRATION
diff --git a/src/imports/opcua/CMakeLists.txt b/src/imports/opcua/CMakeLists.txt
index 510fb06..44fb252 100644
--- a/src/imports/opcua/CMakeLists.txt
+++ b/src/imports/opcua/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## opcua Plugin:
 #####################################################################
 
-qt_add_qml_module(declarative_opcua # special case
+qt_internal_add_qml_module(declarative_opcua # special case
     VERSION "1.0"
     CLASSNAME OpcUaPlugin
     SKIP_TYPE_REGISTRATION
diff --git a/src/opcua/.prev_CMakeLists.txt b/src/opcua/.prev_CMakeLists.txt
index b9353e9..a5b614c 100644
--- a/src/opcua/.prev_CMakeLists.txt
+++ b/src/opcua/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## OpcUa Module:
 #####################################################################
 
-qt_add_module(OpcUa
+qt_internal_add_module(OpcUa
     PLUGIN_TYPES opcua
     SOURCES
         client/qopcuaaddnodeitem.cpp client/qopcuaaddnodeitem.h
@@ -78,7 +78,7 @@ qt_add_module(OpcUa
 ## Scopes:
 #####################################################################
 
-qt_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT
+qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT
     SOURCES
         client/qopcuagdsclient.cpp client/qopcuagdsclient_p.h
         x509/openssl_symbols.cpp
@@ -95,11 +95,11 @@ qt_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE
         x509/qopcuax509utils.cpp
 )
 
-qt_extend_target(OpcUa CONDITION NOT QT_FEATURE_ns0idnames
+qt_internal_extend_target(OpcUa CONDITION NOT QT_FEATURE_ns0idnames
     DEFINES
         QT_OPCUA_NO_NS0IDNAMES
 )
-qt_add_docs(OpcUa
+qt_internal_add_docs(OpcUa
     doc/qtopcua.qdocconf
 )
 
diff --git a/src/opcua/CMakeLists.txt b/src/opcua/CMakeLists.txt
index 69eb14e..3f174ca 100644
--- a/src/opcua/CMakeLists.txt
+++ b/src/opcua/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## OpcUa Module:
 #####################################################################
 
-qt_add_module(OpcUa
+qt_internal_add_module(OpcUa
     PLUGIN_TYPES opcua
     SOURCES
         client/qopcuaaddnodeitem.cpp client/qopcuaaddnodeitem.h
@@ -78,7 +78,7 @@ qt_add_module(OpcUa
 ## Scopes:
 #####################################################################
 
-qt_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT
+qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT
     SOURCES
         client/qopcuagdsclient.cpp client/qopcuagdsclient_p.h
         x509/openssl_symbols.cpp
@@ -97,16 +97,15 @@ qt_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE
 
 # special case begin
 if (QT_FEATURE_gds AND QT_FEATURE_ssl)
-    qt_extend_target(OpcUa
+    qt_internal_extend_target(OpcUa
         LIBRARIES WrapOpenSSL::WrapOpenSSL)
 endif()
 # special case end
 
-qt_extend_target(OpcUa CONDITION NOT QT_FEATURE_ns0idnames
+qt_internal_extend_target(OpcUa CONDITION NOT QT_FEATURE_ns0idnames
     DEFINES
         QT_OPCUA_NO_NS0IDNAMES
 )
-qt_add_docs(OpcUa
+qt_internal_add_docs(OpcUa
     doc/qtopcua.qdocconf
 )
-
diff --git a/src/plugins/opcua/open62541/.prev_CMakeLists.txt b/src/plugins/opcua/open62541/.prev_CMakeLists.txt
index 9dfbf8f..c9c5f33 100644
--- a/src/plugins/opcua/open62541/.prev_CMakeLists.txt
+++ b/src/plugins/opcua/open62541/.prev_CMakeLists.txt
@@ -30,14 +30,14 @@ qt_internal_add_plugin(QOpen62541Plugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
     SOURCES
         ../../../3rdparty/open62541/open62541.h
     INCLUDE_DIRECTORIES
         ../../../3rdparty/open62541
 )
 
-qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
     DEFINES
         UA_ENABLE_ENCRYPTION
         UA_ENABLE_ENCRYPTION_MBEDTLS
@@ -45,17 +45,17 @@ qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_op
         mbedtls
 )
 
-qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND win32-msvc AND NOT QT_FEATURE_system_open62541
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND win32-msvc AND NOT QT_FEATURE_system_open62541
     PUBLIC_LIBRARIES
         ws2_32.lib
 )
 
-qt_extend_target(QOpen62541Plugin CONDITION (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) AND (win32-g++)
+qt_internal_extend_target(QOpen62541Plugin CONDITION (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) AND (win32-g++)
     PUBLIC_LIBRARIES
         ws2_32
 )
 
-qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 AND (WINRT OR win32-msvc)
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 AND (WINRT OR win32-msvc)
     SOURCES
         ../../../3rdparty/open62541/open62541.c
 )
@@ -72,12 +72,12 @@ qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEAT
 #### Keys ignored in scope 11:.:../../../3rdparty:../../../3rdparty/open62541.pri:silent:
 # open62541_compiler.commands = "@echo" "compiling" "${QMAKE_FILE_IN}" "&&"
 
-qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541
     LIBRARIES
         open62541
 )
 
-qt_extend_target(QOpen62541Plugin CONDITION win32-msvc AND (QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541)
+qt_internal_extend_target(QOpen62541Plugin CONDITION win32-msvc AND (QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541)
     PUBLIC_LIBRARIES
         open62541.lib
 )
diff --git a/src/plugins/opcua/open62541/CMakeLists.txt b/src/plugins/opcua/open62541/CMakeLists.txt
index 7b928c3..f28a331 100644
--- a/src/plugins/opcua/open62541/CMakeLists.txt
+++ b/src/plugins/opcua/open62541/CMakeLists.txt
@@ -30,7 +30,7 @@ qt_internal_add_plugin(QOpen62541Plugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
     SOURCES
         ../../../3rdparty/open62541/open62541.h
 # special case begin
@@ -41,7 +41,7 @@ qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEAT
 )
 
 # special case begin
-#qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
+#qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
 #    DEFINES
 #        UA_ENABLE_ENCRYPTION
 #        UA_ENABLE_ENCRYPTION_MBEDTLS
@@ -55,7 +55,7 @@ if (QT_FEATURE_open62541_security AND NOT QT_FEATURE_system_open62541)
     find_package(WrapOpenSSL 1.1)
 endif()
 
-qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541_security AND WrapOpenSSL_FOUND AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541_security AND WrapOpenSSL_FOUND AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
     DEFINES
         UA_ENABLE_ENCRYPTION
         UA_ENABLE_ENCRYPTION_OPENSSL
@@ -64,18 +64,18 @@ qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541_security AND Wr
 )
 # special case end
 
-qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND WIN32 AND MSVC AND NOT QT_FEATURE_system_open62541 # special case
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND WIN32 AND MSVC AND NOT QT_FEATURE_system_open62541 # special case
     PUBLIC_LIBRARIES
         ws2_32.lib
 )
 
-qt_extend_target(QOpen62541Plugin CONDITION (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) AND (WIN32 AND GCC) # special case
+qt_internal_extend_target(QOpen62541Plugin CONDITION (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) AND (WIN32 AND GCC) # special case
     PUBLIC_LIBRARIES
         ws2_32
 )
 
 # special case begin
-#qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 AND (WINRT OR WIN32 AND MSVC)
+#qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 AND (WINRT OR WIN32 AND MSVC)
 #    SOURCES
 #        ../../../3rdparty/open62541/open62541.c
 #)
@@ -109,13 +109,13 @@ endif()
 #### Keys ignored in scope 11:.:../../../3rdparty:../../../3rdparty/open62541.pri:silent:
 # open62541_compiler.commands = "@echo" "compiling" "${QMAKE_FILE_IN}" "&&"
 
-qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541
     LIBRARIES
         open62541
 )
 
 # special case begin
-#qt_extend_target(QOpen62541Plugin CONDITION WIN32 AND MSVC AND (QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541)
+#qt_internal_extend_target(QOpen62541Plugin CONDITION WIN32 AND MSVC AND (QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541)
 #    PUBLIC_LIBRARIES
 #        open62541.lib
 #)