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: I7f86da0411b4870b1a9f9e1ed0b63cf30ccd48ad
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

10 files changed, 12 insertions, 10 deletions

diff --git a/src/geniviextras/CMakeLists.txt b/src/geniviextras/CMakeLists.txt
index 7dfc8b6..ca4e39d 100644
--- a/src/geniviextras/CMakeLists.txt
+++ b/src/geniviextras/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## GeniviExtras Module:
 #####################################################################
 
-qt_add_module(GeniviExtras
+qt_internal_add_module(GeniviExtras
     SOURCES
         qdlt.h
         qdltregistration.cpp qdltregistration.h qdltregistration_p.h
diff --git a/src/helper/remoteobjects/CMakeLists.txt b/src/helper/remoteobjects/CMakeLists.txt
index 142e759..64a1e2e 100644
--- a/src/helper/remoteobjects/CMakeLists.txt
+++ b/src/helper/remoteobjects/CMakeLists.txt
@@ -10,7 +10,7 @@
 # building the module and at that time the rep headers are not created yet
 set(QT_FEATURE_headersclean FALSE)
 
-qt_add_module(IviRemoteObjectsHelper
+qt_internal_add_module(IviRemoteObjectsHelper
     CONFIG_MODULE_NAME iviremoteobjects_helper
     STATIC
     INTERNAL_MODULE
diff --git a/src/imports/core/CMakeLists.txt b/src/imports/core/CMakeLists.txt
index cfdd228..7029cc4 100644
--- a/src/imports/core/CMakeLists.txt
+++ b/src/imports/core/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtivicoreplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qtivicoreplugin
+qt_internal_add_qml_module(qtivicoreplugin
     URI "QtIvi"
     VERSION "1.0"
     CLASSNAME QtIviCorePlugin
diff --git a/src/imports/media/CMakeLists.txt b/src/imports/media/CMakeLists.txt
index 70c82ab..a54254b 100644
--- a/src/imports/media/CMakeLists.txt
+++ b/src/imports/media/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtivimediaplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qtivimediaplugin
+qt_internal_add_qml_module(qtivimediaplugin
     URI "QtIvi.Media"
     VERSION "1.0"
     CLASSNAME QIviMediaPlugin
diff --git a/src/imports/vehiclefunctions/CMakeLists.txt b/src/imports/vehiclefunctions/CMakeLists.txt
index d5a7c70..ee05122 100644
--- a/src/imports/vehiclefunctions/CMakeLists.txt
+++ b/src/imports/vehiclefunctions/CMakeLists.txt
@@ -4,6 +4,8 @@
 ## vehiclefunctions Plugin:
 #####################################################################
 
+set(CMAKE_AUTOMOC ON)
+
 # IVI Generator:
 qt_ivigenerator(qtivivehiclefunctionsplugin
     QFACE_SOURCES ../../ivivehiclefunctions/ivivehiclefunctions.qface
diff --git a/src/ivicore/CMakeLists.txt b/src/ivicore/CMakeLists.txt
index d6d7aed..e9b801c 100644
--- a/src/ivicore/CMakeLists.txt
+++ b/src/ivicore/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## IviCore Module:
 #####################################################################
 
-qt_add_module(IviCore
+qt_internal_add_module(IviCore
     PLUGIN_TYPES qtivi
     SOURCES
         qiviabstractfeature.cpp qiviabstractfeature.h qiviabstractfeature_p.h
@@ -65,7 +65,7 @@ qt_add_module(IviCore
 # qlalr.input = "QLALR"
 # qlalr.output = "$$PWD/${QMAKE_FILE_BASE}_p.h"
 
-qt_extend_target(IviCore CONDITION NOT enable-qlalr
+qt_internal_extend_target(IviCore CONDITION NOT enable-qlalr
     SOURCES
         queryparser/qiviqueryparser_p.h
         queryparser/qiviqueryparser_flex_p.h
diff --git a/src/ivicore/queryparser/CMakeLists.txt b/src/ivicore/queryparser/CMakeLists.txt
index 08aaeed..21cffa4 100644
--- a/src/ivicore/queryparser/CMakeLists.txt
+++ b/src/ivicore/queryparser/CMakeLists.txt
@@ -29,7 +29,7 @@ qt_add_executable(queryparser
 # qlalr.input = "QLALR"
 # qlalr.output = "$$PWD/${QMAKE_FILE_BASE}_p.h"
 
-qt_extend_target(queryparser CONDITION NOT enable-qlalr
+qt_internal_extend_target(queryparser CONDITION NOT enable-qlalr
     SOURCES
         qiviqueryparser_p.h
         qiviqueryparser_flex_p.h
diff --git a/src/ivimedia/CMakeLists.txt b/src/ivimedia/CMakeLists.txt
index 5132eba..ef749bb 100644
--- a/src/ivimedia/CMakeLists.txt
+++ b/src/ivimedia/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## IviMedia Module:
 #####################################################################
 
-qt_add_module(IviMedia
+qt_internal_add_module(IviMedia
     SOURCES
         qiviamfmtuner.cpp qiviamfmtuner.h qiviamfmtuner_p.h
         qiviamfmtunerbackendinterface.cpp qiviamfmtunerbackendinterface.h
diff --git a/src/ivivehiclefunctions/CMakeLists.txt b/src/ivivehiclefunctions/CMakeLists.txt
index 4541cb1..d481eda 100644
--- a/src/ivivehiclefunctions/CMakeLists.txt
+++ b/src/ivivehiclefunctions/CMakeLists.txt
@@ -13,7 +13,7 @@ qt_ivigenerator_generate(
 )
 make_directory(${QT_BUILD_DIR}/src/ivivehiclefunctions)
 
-qt_add_module(IviVehicleFunctions
+qt_internal_add_module(IviVehicleFunctions
     LIBRARIES
         Qt::CorePrivate
         Qt::IviCorePrivate
diff --git a/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt b/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt
index 8a091b3..a883a35 100644
--- a/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt
+++ b/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt
@@ -27,7 +27,7 @@ set(qml_resource_files
     "simulation.qml"
 )
 
-qt_add_resource(${target_name} "qml"
+qt_internal_add_resource(${target_name} "qml"
     PREFIX
         "/simulation"
     BASE