summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/plugin
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-07-07 18:01:06 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-07-09 09:38:35 +0200
commite9a328bc0e56b429a370b13c8e0b4790916cebde (patch)
tree059f3b089a8557cb4c45e3dc059b58e020e34dcb /tests/auto/corelib/plugin
parent5417f1e40cb647c05bffad21493feacac45f193e (diff)
CMake: Regenerate tests with new qt_ prefixed APIs
Use pro2cmake with '--api-version 2' to force regenerate projects to use the new prefixed qt_foo APIs. Change-Id: I055c4837860319e93aaa6b09d646dda4fc2a4069 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/corelib/plugin')
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt6
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt14
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/corelib/plugin/quuid/test/CMakeLists.txt4
21 files changed, 46 insertions, 48 deletions
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
index fe5670da88..2eaac94408 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin1 Generic Library:
#####################################################################
-add_cmake_library(plugin1
+qt_add_cmake_library(plugin1
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ add_cmake_library(plugin1
## Scopes:
#####################################################################
-extend_target(plugin1 CONDITION NOT QT_FEATURE_library
+qt_extend_target(plugin1 CONDITION NOT QT_FEATURE_library
DEFINES
QT_STATICPLUGIN
)
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
index fe616f7cb2..0e0c589fc1 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin2 Generic Library:
#####################################################################
-add_cmake_library(plugin2
+qt_add_cmake_library(plugin2
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ add_cmake_library(plugin2
## Scopes:
#####################################################################
-extend_target(plugin2 CONDITION NOT QT_FEATURE_library
+qt_extend_target(plugin2 CONDITION NOT QT_FEATURE_library
DEFINES
QT_STATICPLUGIN
)
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
index 454b6c061a..9e3a686340 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfactoryloader Test:
#####################################################################
-add_qt_test(tst_qfactoryloader
+qt_add_test(tst_qfactoryloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../plugin1/plugininterface1.h
@@ -17,7 +17,7 @@ add_qt_test(tst_qfactoryloader
## Scopes:
#####################################################################
-extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
+qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
PUBLIC_LIBRARIES
# Remove: L
../bin/
@@ -31,7 +31,7 @@ if(ANDROID)
${CMAKE_CURRENT_BINARY_DIR}/../bin
)
- add_qt_resource(tst_qfactoryloader "qmake_libs"
+ qt_add_resource(tst_qfactoryloader "qmake_libs"
PREFIX
"android_test_data"
BASE
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
index d532eeeb4b..7d10294399 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qfactoryloader Test:
#####################################################################
-add_qt_test(tst_qfactoryloader
+qt_add_test(tst_qfactoryloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../plugin1/plugininterface1.h
@@ -23,7 +23,7 @@ if (NOT QT_FEATURE_library)
endif()
# special case end
-extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
+qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
PUBLIC_LIBRARIES
# Remove: L
# special case begin
@@ -57,7 +57,7 @@ if(ANDROID)
endif()
# special case end
- add_qt_resource(tst_qfactoryloader "qmake_libs"
+ qt_add_resource(tst_qfactoryloader "qmake_libs"
PREFIX
"android_test_data"
BASE
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
index 6dbbd7a060..b1435b77d3 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## mylib Generic Library:
#####################################################################
-add_cmake_library(mylib
+qt_add_cmake_library(mylib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
@@ -22,7 +22,7 @@ add_cmake_library(mylib
## Scopes:
#####################################################################
-extend_target(mylib CONDITION MSVC
+qt_extend_target(mylib CONDITION MSVC
DEFINES
WIN32_MSVC
)
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
index f3480200cc..41bd6bf252 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
@@ -4,7 +4,7 @@
## mylib Generic Library:
#####################################################################
-add_cmake_library(mylib
+qt_add_cmake_library(mylib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
@@ -37,7 +37,7 @@ endif()
## Scopes:
#####################################################################
-extend_target(mylib CONDITION MSVC
+qt_extend_target(mylib CONDITION MSVC
DEFINES
WIN32_MSVC
)
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
index ac6515ba63..c3af98df13 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "../library_path/invalid.so")
-add_qt_test(tst_qlibrary
+qt_add_test(tst_qlibrary
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qlibrary.cpp
@@ -26,7 +26,7 @@ if(ANDROID)
${CMAKE_CURRENT_BINARY_DIR}/../system.qt.test.mylib.so
)
- add_qt_resource(tst_qlibrary "qmake_libs"
+ qt_add_resource(tst_qlibrary "qmake_libs"
PREFIX
"android_test_data"
BASE
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
index e6086a982f..a99b96c806 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "../library_path/invalid.so")
-add_qt_test(tst_qlibrary
+qt_add_test(tst_qlibrary
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qlibrary.cpp
@@ -39,7 +39,7 @@ if(ANDROID)
# special case end
)
- add_qt_resource(tst_qlibrary "qmake_libs"
+ qt_add_resource(tst_qlibrary "qmake_libs"
PREFIX
"android_test_data"
BASE
diff --git a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
index ab32e5e364..379faad981 100644
--- a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## debugplugin Generic Library:
#####################################################################
-add_cmake_library(debugplugin
+qt_add_cmake_library(debugplugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
SOURCES
diff --git a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
index c3eb37d930..0dc5a28edb 100644
--- a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## invalidplugin Generic Library:
#####################################################################
-add_cmake_library(invalidplugin
+qt_add_cmake_library(invalidplugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
SOURCES
diff --git a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
index 893386bc6b..0332bcc15b 100644
--- a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## releaseplugin Generic Library:
#####################################################################
-add_cmake_library(releaseplugin
+qt_add_cmake_library(releaseplugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
SOURCES
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
index 5e42a1aef0..64b1db677d 100644
--- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## almostplugin Generic Library:
#####################################################################
-add_cmake_library(almostplugin
+qt_add_cmake_library(almostplugin
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ add_cmake_library(almostplugin
## Scopes:
#####################################################################
-extend_target(almostplugin CONDITION GCC
+qt_extend_target(almostplugin CONDITION GCC
LINK_OPTIONS
"--Wl,--no-undefined"
)
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
index 5208a70c9d..c8a320d2cf 100644
--- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## almostplugin Generic Library:
#####################################################################
-add_cmake_library(almostplugin
+qt_add_cmake_library(almostplugin
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -25,7 +25,7 @@ add_cmake_library(almostplugin
qt_autogen_tools_initial_setup(almostplugin)
# special case begin
# We want the opposite of this
-#extend_target(almostplugin CONDITION GCC
+#qt_extend_target(almostplugin CONDITION GCC
# LINK_OPTIONS
# "--Wl,--no-undefined"
#)
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
index dddd7cb953..b5ae34e9df 100644
--- a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpluginloaderlib Generic Library:
#####################################################################
-add_cmake_library(tst_qpluginloaderlib
+qt_add_cmake_library(tst_qpluginloaderlib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ add_cmake_library(tst_qpluginloaderlib
## Scopes:
#####################################################################
-extend_target(tst_qpluginloaderlib CONDITION MSVC
+qt_extend_target(tst_qpluginloaderlib CONDITION MSVC
DEFINES
WIN32_MSVC
)
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
index c547b75592..f760ce9935 100644
--- a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpluginloaderlib Generic Library:
#####################################################################
-add_cmake_library(tst_qpluginloaderlib
+qt_add_cmake_library(tst_qpluginloaderlib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -29,7 +29,7 @@ endif()
## Scopes:
#####################################################################
-extend_target(tst_qpluginloaderlib CONDITION MSVC
+qt_extend_target(tst_qpluginloaderlib CONDITION MSVC
DEFINES
WIN32_MSVC
)
diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
index fb9d365d74..0eb42728f4 100644
--- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## staticplugin Generic Library:
#####################################################################
-add_cmake_library(staticplugin
+qt_add_cmake_library(staticplugin
STATIC
SOURCES
main.cpp
diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
index 83f5f0605e..ef39d6cc0f 100644
--- a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## theplugin Generic Library:
#####################################################################
-add_cmake_library(theplugin
+qt_add_cmake_library(theplugin
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
index 8bef975168..0b0d76bbc4 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@
list(APPEND test_data "../elftest")
list(APPEND test_data "../machtest")
-add_qt_test(tst_qpluginloader
+qt_add_test(tst_qpluginloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../fakeplugin.cpp
@@ -22,24 +22,22 @@ add_qt_test(tst_qpluginloader
## Scopes:
#####################################################################
-extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
- LIBRARIES
- Qt::CorePrivate
+qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
PUBLIC_LIBRARIES
- Qt::Core
+ Qt::CorePrivate
)
-extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
+qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
PUBLIC_LIBRARIES
# Remove: L../staticplugin/debug
)
-extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
PUBLIC_LIBRARIES
# Remove: L../staticplugin/release
)
-extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
+qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
PUBLIC_LIBRARIES
# Remove: L../staticplugin
)
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
index c1c0d4b02b..0b0d76bbc4 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
@@ -8,7 +8,7 @@
list(APPEND test_data "../elftest")
list(APPEND test_data "../machtest")
-add_qt_test(tst_qpluginloader
+qt_add_test(tst_qpluginloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../fakeplugin.cpp
@@ -22,22 +22,22 @@ add_qt_test(tst_qpluginloader
## Scopes:
#####################################################################
-extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
+qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
PUBLIC_LIBRARIES
Qt::CorePrivate
)
-extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
+qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
PUBLIC_LIBRARIES
# Remove: L../staticplugin/debug
)
-extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
PUBLIC_LIBRARIES
# Remove: L../staticplugin/release
)
-extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
+qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
PUBLIC_LIBRARIES
# Remove: L../staticplugin
)
diff --git a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
index c635f6479c..05ed8f84ac 100644
--- a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_quuid Test:
#####################################################################
-add_qt_test(tst_quuid
+qt_add_test(tst_quuid
SOURCES
../tst_quuid.cpp
)
@@ -12,7 +12,7 @@ add_qt_test(tst_quuid
## Scopes:
#####################################################################
-extend_target(tst_quuid CONDITION APPLE
+qt_extend_target(tst_quuid CONDITION APPLE
SOURCES
../tst_quuid_darwin.mm
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
index 5707dfa5a1..1ba9de95ca 100644
--- a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_quuid Test:
#####################################################################
-add_qt_test(tst_quuid
+qt_add_test(tst_quuid
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
SOURCES
../tst_quuid.cpp
@@ -13,7 +13,7 @@ add_qt_test(tst_quuid
## Scopes:
#####################################################################
-extend_target(tst_quuid CONDITION APPLE
+qt_extend_target(tst_quuid CONDITION APPLE
SOURCES
../tst_quuid_darwin.mm
PUBLIC_LIBRARIES