diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-07 18:01:06 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 09:38:35 +0200 |
commit | e9a328bc0e56b429a370b13c8e0b4790916cebde (patch) | |
tree | 059f3b089a8557cb4c45e3dc059b58e020e34dcb /tests/auto/corelib/plugin/qfactoryloader | |
parent | 5417f1e40cb647c05bffad21493feacac45f193e (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/qfactoryloader')
4 files changed, 10 insertions, 10 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 |