diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-04 16:18:44 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-06 21:08:21 +0200 |
| commit | b2f00dfb46af633b00946cb1ebfe963964f803ca (patch) | |
| tree | 0b52bda2d0e77744c7969c06ce5882c8d7c9cb2d /tests | |
| parent | eb4fb9fa32797d48d4779464483230ad92f349a6 (diff) | |
CMake: Rename qt6_add_plugin TYPE option to PLUGIN_TYPE
The intention is to remove TYPE as a keyword completely before 6.2.0
release, but in case if that's not possible due to the large amount
of repositories and examples, just print a deprecation warning for
now and handle both TYPE and PLUGIN_TYPE.
Task-number: QTBUG-95170
Pick-to: 6.2
Change-Id: If0c18345483b9254b0fc21120229fcc2a2fbfbf5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests')
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt index 9443e15c56..5bb7d6cc76 100644 --- a/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt @@ -1,6 +1,6 @@ qt_internal_add_plugin(QMock1Plugin CLASS_NAME QMock1Plugin - TYPE mockplugin + PLUGIN_TYPE mockplugin SOURCES qmock1plugin.cpp qmock1plugin.h PUBLIC_LIBRARIES diff --git a/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt index 7e88d2ea84..d8d28ea6eb 100644 --- a/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt @@ -1,6 +1,6 @@ qt_internal_add_plugin(QMock2Plugin CLASS_NAME QMock2Plugin - TYPE mockplugin + PLUGIN_TYPE mockplugin SOURCES qmock2plugin.cpp qmock2plugin.h PUBLIC_LIBRARIES diff --git a/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt index e58947d5e7..0a5e1fc5e4 100644 --- a/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt @@ -1,6 +1,6 @@ qt_internal_add_plugin(QMock3Plugin CLASS_NAME QMock3Plugin - TYPE mockplugin + PLUGIN_TYPE mockplugin SOURCES qmock3plugin.cpp qmock3plugin.h PUBLIC_LIBRARIES diff --git a/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt index f254f044d5..f269ad3f82 100644 --- a/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt @@ -1,6 +1,6 @@ qt_internal_add_plugin(QMock4Plugin CLASS_NAME QMock4Plugin - TYPE mockplugin + PLUGIN_TYPE mockplugin DEFAULT_IF FALSE SOURCES qmock4plugin.cpp qmock4plugin.h diff --git a/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt index a66f8955a0..da1b8a9b33 100644 --- a/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt @@ -1,6 +1,6 @@ qt_internal_add_plugin(QMock5Plugin CLASS_NAME QMock5Plugin - TYPE mockplugin + PLUGIN_TYPE mockplugin DEFAULT_IF FALSE SOURCES qmock5plugin.cpp qmock5plugin.h diff --git a/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt index 974b891704..3f203bed6e 100644 --- a/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt @@ -1,6 +1,6 @@ qt_internal_add_plugin(QMock6Plugin CLASS_NAME QMock6Plugin - TYPE mockauxplugin + PLUGIN_TYPE mockauxplugin SOURCES qmock6plugin.cpp qmock6plugin.h PUBLIC_LIBRARIES diff --git a/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt b/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt index 07ce26e052..99cb4a286e 100644 --- a/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt +++ b/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt @@ -1,7 +1,7 @@ qt_internal_add_plugin(TestInitResourcesStaticPlugin STATIC OUTPUT_NAME testinitresourcesstaticplugin - TYPE mockstaticresources + PLUGIN_TYPE mockstaticresources SOURCES pluginmain.cpp SKIP_INSTALL diff --git a/tests/auto/cmake/tst_qaddpreroutine/CMakeLists.txt b/tests/auto/cmake/tst_qaddpreroutine/CMakeLists.txt index 74de74f7ec..624a1214c8 100644 --- a/tests/auto/cmake/tst_qaddpreroutine/CMakeLists.txt +++ b/tests/auto/cmake/tst_qaddpreroutine/CMakeLists.txt @@ -25,7 +25,7 @@ qt_internal_add_plugin(QTBUG_90341ThemePlugin OUTPUT_NAME QTBUG_90341 OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" CLASS_NAME ThemePlugin - TYPE platformthemes + PLUGIN_TYPE platformthemes DEFAULT_IF TRUE SOURCES plugin.cpp |