From b2f00dfb46af633b00946cb1ebfe963964f803ca Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 4 Aug 2021 16:18:44 +0200 Subject: 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 Reviewed-by: Joerg Bornemann --- src/plugins/platforms/ios/CMakeLists.txt | 2 +- src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/ios') diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index b175adcc4a..204add279c 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -7,7 +7,7 @@ qt_internal_add_plugin(QIOSIntegrationPlugin OUTPUT_NAME qios DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES ios # special case - TYPE platforms + PLUGIN_TYPE platforms SOURCES plugin.mm qiosapplicationdelegate.h qiosapplicationdelegate.mm diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt index 76253adb47..a6351edd59 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary OUTPUT_NAME qiosnsphotolibrarysupport - TYPE platforms/darwin + PLUGIN_TYPE platforms/darwin DEFAULT_IF FALSE SOURCES plugin.mm -- cgit v1.2.3