CMake: Disable usage of CMake API compatibility wrappers

Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable
in the project ensures we ported away from old API calls.

Task-number: QTBUG-86815
Change-Id: I58d7107f556e2f06ecf5b47fab65ccec7d929b6d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

10 files changed, 25 insertions, 22 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91cbf10..b00bab2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,9 @@ project(QtOpcUa
     LANGUAGES CXX C
 )
 
+# Make sure we only use latest private CMake API, aka no compatibility wrappers.
+set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
+
 # Make sure we use the fixed BASE argument of qt_add_resource.
 set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE)
 
diff --git a/src/plugins/opcua/uacpp/CMakeLists.txt b/src/plugins/opcua/uacpp/CMakeLists.txt
index 6ecb3d4..145778e 100644
--- a/src/plugins/opcua/uacpp/CMakeLists.txt
+++ b/src/plugins/opcua/uacpp/CMakeLists.txt
@@ -30,7 +30,7 @@ qt_internal_add_plugin(QUACppPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QUACppPlugin CONDITION WIN32
+qt_internal_extend_target(QUACppPlugin CONDITION WIN32
     DEFINES
         _UA_STACK_USE_DLL
 )
diff --git a/tests/auto/clientSetupInCpp/CMakeLists.txt b/tests/auto/clientSetupInCpp/CMakeLists.txt
index 6a58c4e..bb467cb 100644
--- a/tests/auto/clientSetupInCpp/CMakeLists.txt
+++ b/tests/auto/clientSetupInCpp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_clientSetupInCpp Test:
 #####################################################################
 
-qt_add_test(tst_clientSetupInCpp
+qt_internal_add_test(tst_clientSetupInCpp
     GUI
     QMLTEST
     QML_IMPORTPATH
@@ -27,7 +27,7 @@ qt_add_test(tst_clientSetupInCpp
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_clientSetupInCpp CONDITION QT_FEATURE_open62541_security # special case
+qt_internal_extend_target(tst_clientSetupInCpp CONDITION QT_FEATURE_open62541_security # special case
     DEFINES
         SERVER_SUPPORTS_SECURITY
 )
diff --git a/tests/auto/connection/CMakeLists.txt b/tests/auto/connection/CMakeLists.txt
index 36cbc2b..36bda84 100644
--- a/tests/auto/connection/CMakeLists.txt
+++ b/tests/auto/connection/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_connection Test:
 #####################################################################
 
-qt_add_test(tst_connection
+qt_internal_add_test(tst_connection
     SOURCES
         ../../common/backend_environment.h
         tst_connection.cpp
diff --git a/tests/auto/declarative/CMakeLists.txt b/tests/auto/declarative/CMakeLists.txt
index 0818bfb..a62eb2d 100644
--- a/tests/auto/declarative/CMakeLists.txt
+++ b/tests/auto/declarative/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_opcua Test:
 #####################################################################
 
-qt_add_test(tst_opcua
+qt_internal_add_test(tst_opcua
     GUI
     QMLTEST
     QML_IMPORTPATH
@@ -27,7 +27,7 @@ qt_add_test(tst_opcua
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_opcua CONDITION QT_FEATURE_open62541_security # special case
+qt_internal_extend_target(tst_opcua CONDITION QT_FEATURE_open62541_security # special case
     DEFINES
         SERVER_SUPPORTS_SECURITY
 )
diff --git a/tests/auto/qopcuaclient/CMakeLists.txt b/tests/auto/qopcuaclient/CMakeLists.txt
index a098ffc..a6eaa99 100644
--- a/tests/auto/qopcuaclient/CMakeLists.txt
+++ b/tests/auto/qopcuaclient/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qopcuaclient Test:
 #####################################################################
 
-qt_add_test(tst_qopcuaclient
+qt_internal_add_test(tst_qopcuaclient
     SOURCES
         ../../common/backend_environment.h
         tst_client.cpp
@@ -20,7 +20,7 @@ set(data_resource_files
     "../../open62541-testserver/pki/own/certs/open62541-testserver.der"
 )
 
-qt_add_resource(tst_qopcuaclient "data"
+qt_internal_add_resource(tst_qopcuaclient "data"
     PREFIX
         "/"
     FILES
@@ -31,7 +31,7 @@ qt_add_resource(tst_qopcuaclient "data"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qopcuaclient CONDITION QT_FEATURE_open62541_security AND QT_FEATURE_open62541 # special case
+qt_internal_extend_target(tst_qopcuaclient CONDITION QT_FEATURE_open62541_security AND QT_FEATURE_open62541 # special case
     DEFINES
         SERVER_SUPPORTS_SECURITY
 )
diff --git a/tests/auto/security/CMakeLists.txt b/tests/auto/security/CMakeLists.txt
index 0a47ed7..5ed40d0 100644
--- a/tests/auto/security/CMakeLists.txt
+++ b/tests/auto/security/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_security Test:
 #####################################################################
 
-qt_add_test(tst_security
+qt_internal_add_test(tst_security
     SOURCES
         ../../common/backend_environment.h
         tst_security.cpp
@@ -25,7 +25,7 @@ set(certs_resource_files
     "pki/trusted/crl/ca.crl.pem"
 )
 
-qt_add_resource(tst_security "certs"
+qt_internal_add_resource(tst_security "certs"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/x509/CMakeLists.txt b/tests/auto/x509/CMakeLists.txt
index 5b512b7..1af14a9 100644
--- a/tests/auto/x509/CMakeLists.txt
+++ b/tests/auto/x509/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_x509 Test:
 #####################################################################
 
-qt_add_test(tst_x509
+qt_internal_add_test(tst_x509
     SOURCES
         tst_x509.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/gds/CMakeLists.txt b/tests/manual/gds/CMakeLists.txt
index 478c42f..e5df657 100644
--- a/tests/manual/gds/CMakeLists.txt
+++ b/tests/manual/gds/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_gds Test:
 #####################################################################
 
-qt_add_test(tst_gds
+qt_internal_add_test(tst_gds
     SOURCES
         tst_gds.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/open62541-testserver/CMakeLists.txt b/tests/open62541-testserver/CMakeLists.txt
index 067d8af..0c2cbae 100644
--- a/tests/open62541-testserver/CMakeLists.txt
+++ b/tests/open62541-testserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## open62541-testserver Binary:
 #####################################################################
 
-qt_add_executable(open62541-testserver
+qt_internal_add_executable(open62541-testserver
     SOURCES
         ../../src/plugins/opcua/open62541/qopen62541utils.cpp
         ../../src/plugins/opcua/open62541/qopen62541valueconverter.cpp
@@ -31,7 +31,7 @@ set(certs_resource_files
     "pki/trusted/certs/tst_security.der"
 )
 
-qt_add_resource(open62541-testserver "certs"
+qt_internal_add_resource(open62541-testserver "certs"
     PREFIX
         "/"
     FILES
@@ -56,7 +56,7 @@ qt_opcua_disable_optimizations_in_current_dir()
 ## Scopes:
 #####################################################################
 
-qt_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
+qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
     SOURCES
         ../../src/3rdparty/open62541/open62541.h
     ../../src/3rdparty/open62541/open62541.c # special case
@@ -65,7 +65,7 @@ qt_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND NOT QT_
 )
 
 # special case begin
-#qt_extend_target(open62541-testserver CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
+#qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
 #    DEFINES
 #        UA_ENABLE_ENCRYPTION
 #        UA_ENABLE_ENCRYPTION_MBEDTLS
@@ -79,7 +79,7 @@ if (QT_FEATURE_open62541_security AND NOT QT_FEATURE_system_open62541)
     find_package(WrapOpenSSL 1.1)
 endif()
 
-qt_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541_security AND WrapOpenSSL_FOUND AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
+qt_internal_extend_target(open62541-testserver 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
@@ -88,18 +88,18 @@ qt_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541_security AN
 )
 # special case end
 
-qt_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND WIN32 AND MSVC AND NOT QT_FEATURE_system_open62541 # special case
+qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND WIN32 AND MSVC AND NOT QT_FEATURE_system_open62541 # special case
     PUBLIC_LIBRARIES
         ws2_32.lib
 )
 
-qt_extend_target(open62541-testserver CONDITION (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) AND (WIN32 AND GCC) # special case
+qt_internal_extend_target(open62541-testserver 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(open62541-testserver CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 AND (WINRT OR WIN32 AND MSVC)
+#qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 AND (WINRT OR WIN32 AND MSVC)
 #    SOURCES
 #        ../../src/3rdparty/open62541/open62541.c
 #)
@@ -133,7 +133,7 @@ endif()
 #### Keys ignored in scope 11:.:../../src/3rdparty:../../src/3rdparty/open62541.pri:silent:
 # open62541_compiler.commands = "@echo" "compiling" "${QMAKE_FILE_IN}" "&&"
 
-qt_extend_target(open62541-testserver CONDITION QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541
+qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541
     LIBRARIES
         open62541
 )