summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-05-25 15:14:38 +0200
committerDominik Holland <dominik.holland@qt.io>2021-05-26 12:11:07 +0200
commitf357bb6e64ea24e4ec27b6d84c94c3a6dadc24fa (patch)
treef8fe67b7ea4e609f0f16ddcdbed5c636f9bd5966 /tests
parentc09bcfbdf0232f8b827fc2a4dd19ca433a62df5f (diff)
downloadqtivi-f357bb6e64ea24e4ec27b6d84c94c3a6dadc24fa.tar.gz
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt2
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt2
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt2
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt2
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt2
-rw-r--r--tests/auto/core/qiviabstractfeature/CMakeLists.txt2
-rw-r--r--tests/auto/core/qivipagingmodel/CMakeLists.txt2
-rw-r--r--tests/auto/core/qivipendingreply/CMakeLists.txt2
-rw-r--r--tests/auto/core/qivisearchandbrowsemodel/CMakeLists.txt2
-rw-r--r--tests/auto/core/qivisimulationengine/CMakeLists.txt4
-rw-r--r--tests/auto/core/qivisimulationglobalobject/CMakeLists.txt2
-rw-r--r--tests/auto/core/queryparser/CMakeLists.txt2
-rw-r--r--tests/auto/core/servicemanagertest/CMakeLists.txt4
-rw-r--r--tests/auto/core/servicemanagertest/simple_plugin/CMakeLists.txt2
-rw-r--r--tests/auto/core/servicemanagertest/simple_plugin_static/CMakeLists.txt2
-rw-r--r--tests/auto/core/servicemanagertest/wrong_plugin/CMakeLists.txt2
-rw-r--r--tests/auto/core/servicemanagertest/wrongmetadata_plugin/CMakeLists.txt2
-rw-r--r--tests/auto/core/servicemanagertest/wrongmetadata_plugin_static/CMakeLists.txt2
-rw-r--r--tests/auto/dlt/CMakeLists.txt2
-rw-r--r--tests/auto/vehiclefunctions/basic/CMakeLists.txt2
20 files changed, 22 insertions, 22 deletions
diff --git a/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt
index 1d0b134..0d6b2f1 100644
--- a/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp)
-qt_add_test(tst_qface_include
+qt_internal_add_test(tst_qface_include
SOURCES
${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt
index 7f3de43..3e62d8e 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp)
-qt_add_test(tst_org-example-echo-noanno
+qt_internal_add_test(tst_org-example-echo-noanno
SOURCES
${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt
index 812dbd4..c7ad3a5 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp)
-qt_add_test(tst_org-example-echo-noprivate
+qt_internal_add_test(tst_org-example-echo-noprivate
SOURCES
${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt
index 2d990b2..1b824eb 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
-qt_add_test(tst_org-example-echo-qtro
+qt_internal_add_test(tst_org-example-echo-qtro
SOURCES
contactsmodelservice.cpp contactsmodelservice.h
echoservice.cpp echoservice.h
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt
index b480d5f..40ecd25 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp)
-qt_add_test(tst_org-example-echo
+qt_internal_add_test(tst_org-example-echo
SOURCES
${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/core/qiviabstractfeature/CMakeLists.txt b/tests/auto/core/qiviabstractfeature/CMakeLists.txt
index 5d47d83..d39c753 100644
--- a/tests/auto/core/qiviabstractfeature/CMakeLists.txt
+++ b/tests/auto/core/qiviabstractfeature/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
testdata/*)
list(APPEND test_data ${test_data_glob})
-qt_add_test(tst_qiviabstractfeature
+qt_internal_add_test(tst_qiviabstractfeature
SOURCES
qivifeaturetester.h
tst_qiviabstractfeature.cpp
diff --git a/tests/auto/core/qivipagingmodel/CMakeLists.txt b/tests/auto/core/qivipagingmodel/CMakeLists.txt
index f5eedd1..f0671df 100644
--- a/tests/auto/core/qivipagingmodel/CMakeLists.txt
+++ b/tests/auto/core/qivipagingmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qivipagingmodel Test:
#####################################################################
-qt_add_test(tst_qivipagingmodel
+qt_internal_add_test(tst_qivipagingmodel
SOURCES
tst_qivipagingmodel.cpp
DEFINES
diff --git a/tests/auto/core/qivipendingreply/CMakeLists.txt b/tests/auto/core/qivipendingreply/CMakeLists.txt
index 880d5ca..e54ece6 100644
--- a/tests/auto/core/qivipendingreply/CMakeLists.txt
+++ b/tests/auto/core/qivipendingreply/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
testdata/*)
list(APPEND test_data ${test_data_glob})
-qt_add_test(tst_qivipendingreply
+qt_internal_add_test(tst_qivipendingreply
SOURCES
tst_qivipendingreply.cpp
DEFINES
diff --git a/tests/auto/core/qivisearchandbrowsemodel/CMakeLists.txt b/tests/auto/core/qivisearchandbrowsemodel/CMakeLists.txt
index 247f2fd..b53046f 100644
--- a/tests/auto/core/qivisearchandbrowsemodel/CMakeLists.txt
+++ b/tests/auto/core/qivisearchandbrowsemodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qivisearchandbrowsemodel Test:
#####################################################################
-qt_add_test(tst_qivisearchandbrowsemodel
+qt_internal_add_test(tst_qivisearchandbrowsemodel
SOURCES
tst_qivisearchandbrowsemodel.cpp
DEFINES
diff --git a/tests/auto/core/qivisimulationengine/CMakeLists.txt b/tests/auto/core/qivisimulationengine/CMakeLists.txt
index 2f6e20f..70e5f39 100644
--- a/tests/auto/core/qivisimulationengine/CMakeLists.txt
+++ b/tests/auto/core/qivisimulationengine/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qivisimulationengine Test:
#####################################################################
-qt_add_test(tst_qivisimulationengine
+qt_internal_add_test(tst_qivisimulationengine
SOURCES
tst_qivisimulationengine.cpp
PUBLIC_LIBRARIES
@@ -21,7 +21,7 @@ set(resource_resource_files
"simple.qml"
)
-qt_add_resource(tst_qivisimulationengine "resource"
+qt_internal_add_resource(tst_qivisimulationengine "resource"
PREFIX
"/"
FILES
diff --git a/tests/auto/core/qivisimulationglobalobject/CMakeLists.txt b/tests/auto/core/qivisimulationglobalobject/CMakeLists.txt
index b70b0c3..2bde70f 100644
--- a/tests/auto/core/qivisimulationglobalobject/CMakeLists.txt
+++ b/tests/auto/core/qivisimulationglobalobject/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qivisimulationglobalobject Test:
#####################################################################
-qt_add_test(tst_qivisimulationglobalobject
+qt_internal_add_test(tst_qivisimulationglobalobject
SOURCES
tst_qivisimulationglobalobject.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/core/queryparser/CMakeLists.txt b/tests/auto/core/queryparser/CMakeLists.txt
index a460632..9340ed9 100644
--- a/tests/auto/core/queryparser/CMakeLists.txt
+++ b/tests/auto/core/queryparser/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
testdata/*)
list(APPEND test_data ${test_data_glob})
-qt_add_test(tst_queryparser
+qt_internal_add_test(tst_queryparser
SOURCES
tst_queryparser.cpp
DEFINES
diff --git a/tests/auto/core/servicemanagertest/CMakeLists.txt b/tests/auto/core/servicemanagertest/CMakeLists.txt
index 90bb8e2..cf7ce20 100644
--- a/tests/auto/core/servicemanagertest/CMakeLists.txt
+++ b/tests/auto/core/servicemanagertest/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_servicemanagertest Test:
#####################################################################
-qt_add_test(tst_servicemanagertest
+qt_internal_add_test(tst_servicemanagertest
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
SOURCES
tst_servicemanagertest.cpp
@@ -24,7 +24,7 @@ qt_add_test(tst_servicemanagertest
## Scopes:
#####################################################################
-qt_extend_target(tst_servicemanagertest CONDITION QT_FEATURE_debug_and_release
+qt_internal_extend_target(tst_servicemanagertest CONDITION QT_FEATURE_debug_and_release
DEFINES
DEBUG_AND_RELEASE
)
diff --git a/tests/auto/core/servicemanagertest/simple_plugin/CMakeLists.txt b/tests/auto/core/servicemanagertest/simple_plugin/CMakeLists.txt
index 8d334e9..e323c9f 100644
--- a/tests/auto/core/servicemanagertest/simple_plugin/CMakeLists.txt
+++ b/tests/auto/core/servicemanagertest/simple_plugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## simple_plugin Generic Library:
#####################################################################
-qt_add_cmake_library(simple_plugin
+qt_internal_add_cmake_library(simple_plugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi/"
SOURCES
diff --git a/tests/auto/core/servicemanagertest/simple_plugin_static/CMakeLists.txt b/tests/auto/core/servicemanagertest/simple_plugin_static/CMakeLists.txt
index 67a14a2..84888e6 100644
--- a/tests/auto/core/servicemanagertest/simple_plugin_static/CMakeLists.txt
+++ b/tests/auto/core/servicemanagertest/simple_plugin_static/CMakeLists.txt
@@ -4,7 +4,7 @@
## simple_plugin_static Generic Library:
#####################################################################
-qt_add_cmake_library(simple_plugin_static
+qt_internal_add_cmake_library(simple_plugin_static
STATIC
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi/"
SOURCES
diff --git a/tests/auto/core/servicemanagertest/wrong_plugin/CMakeLists.txt b/tests/auto/core/servicemanagertest/wrong_plugin/CMakeLists.txt
index 27e6016..018012e 100644
--- a/tests/auto/core/servicemanagertest/wrong_plugin/CMakeLists.txt
+++ b/tests/auto/core/servicemanagertest/wrong_plugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## wrong_plugin Generic Library:
#####################################################################
-qt_add_cmake_library(wrong_plugin
+qt_internal_add_cmake_library(wrong_plugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi/"
SOURCES
diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/CMakeLists.txt b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/CMakeLists.txt
index 31af21d..1dc6ab5 100644
--- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/CMakeLists.txt
+++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## wrongmetadata_plugin Generic Library:
#####################################################################
-qt_add_cmake_library(wrongmetadata_plugin
+qt_internal_add_cmake_library(wrongmetadata_plugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi/"
SOURCES
diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin_static/CMakeLists.txt b/tests/auto/core/servicemanagertest/wrongmetadata_plugin_static/CMakeLists.txt
index 9d4740b..e3ceebb 100644
--- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin_static/CMakeLists.txt
+++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin_static/CMakeLists.txt
@@ -4,7 +4,7 @@
## wrongmetadata_plugin_static Generic Library:
#####################################################################
-qt_add_cmake_library(wrongmetadata_plugin_static
+qt_internal_add_cmake_library(wrongmetadata_plugin_static
STATIC
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi/"
SOURCES
diff --git a/tests/auto/dlt/CMakeLists.txt b/tests/auto/dlt/CMakeLists.txt
index 24cb772..da6a8fc 100644
--- a/tests/auto/dlt/CMakeLists.txt
+++ b/tests/auto/dlt/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_dlt Test:
#####################################################################
-qt_add_test(tst_dlt
+qt_internal_add_test(tst_dlt
SOURCES
tst_dlt.cpp
DEFINES
diff --git a/tests/auto/vehiclefunctions/basic/CMakeLists.txt b/tests/auto/vehiclefunctions/basic/CMakeLists.txt
index 1b50edd..739ba1e 100644
--- a/tests/auto/vehiclefunctions/basic/CMakeLists.txt
+++ b/tests/auto/vehiclefunctions/basic/CMakeLists.txt
@@ -5,7 +5,7 @@
#####################################################################
file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp)
-qt_add_test(tst_vehiclefunctions_basic
+qt_internal_add_test(tst_vehiclefunctions_basic
SOURCES
${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp
PUBLIC_LIBRARIES