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 --- cmake/QtTargetHelpers.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmake/QtTargetHelpers.cmake') diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake index 911f25a1ae..baee28ee1e 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake @@ -248,7 +248,8 @@ endfunction() function(qt_internal_check_directory_or_type name dir type default result_var) if ("x${dir}" STREQUAL x) if("x${type}" STREQUAL x) - message(FATAL_ERROR "qt_internal_add_plugin called without setting either TYPE or ${name}.") + message(FATAL_ERROR + "qt_internal_add_plugin called without setting either PLUGIN_TYPE or ${name}.") endif() set(${result_var} "${default}" PARENT_SCOPE) else() -- cgit v1.2.3