From d8abcc969b976ecba987947208e3f59b192bc8ff Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Tue, 6 Dec 2022 12:36:45 +0100 Subject: [PATCH] Remove the deprecated TYPE option from qt_add_plugin As far as I can tell nothing uses TYPE anymore. [ChangeLog][QtCore][CMake] The deprecated TYPE option of the qt_add_plugin() has been removed. You can specify the plugin type using the PLUGIN_TYPE option instead. Change-Id: I786fbc772a23ae0037d9a4cf68018e3af5cb061d Reviewed-by: Alexandru Croitor --- .../QtBuildInternalsConfig.cmake | 1 - src/corelib/Qt6CoreMacros.cmake | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 6c3c2380c56..5be59ed54e0 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -881,7 +881,6 @@ macro(qt_examples_build_begin) # annotate where each example is installed to, to be able to derive a relative rpath, and it # seems there's no way to query such information from CMake itself. set(CMAKE_INSTALL_RPATH "${_default_install_rpath}") - set(QT_DISABLE_QT_ADD_PLUGIN_COMPATIBILITY TRUE) install(CODE " # Backup CMAKE_INSTALL_PREFIX because we're going to change it in each example subdirectory diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index a4b17eda993..081cb3bc708 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1999,10 +1999,6 @@ macro(_qt_internal_get_add_plugin_keywords option_args single_args multi_args) __QT_INTERNAL_NO_PROPAGATE_PLUGIN_INITIALIZER ) set(${single_args} - # TODO: For backward compatibility / transitional use only, remove once all repos no longer - # use it - TYPE - PLUGIN_TYPE # Internal use only, may be changed or removed CLASS_NAME OUTPUT_NAME # Internal use only, may be changed or removed @@ -2017,20 +2013,6 @@ function(qt6_add_plugin target) cmake_parse_arguments(PARSE_ARGV 1 arg "${opt_args}" "${single_args}" "${multi_args}") - # Handle the inconsistent TYPE/PLUGIN_TYPE keyword naming between commands - if(arg_TYPE) - if(arg_PLUGIN_TYPE AND NOT arg_TYPE STREQUAL arg_PLUGIN_TYPE) - message(FATAL_ERROR - "Both TYPE and PLUGIN_TYPE were given and were different. " - "Only one of the two should be used." - ) - endif() - message(AUTHOR_WARNING - "The TYPE keyword is deprecated and will be removed soon. Please use PLUGIN_TYPE instead.") - set(arg_PLUGIN_TYPE "${arg_TYPE}") - unset(arg_TYPE) - endif() - if(arg_STATIC AND arg_SHARED) message(FATAL_ERROR "Both STATIC and SHARED options were given. Only one of the two should be used."