AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Remove the CLASSNAME argument from qt6_add_plugin

Browse Source 
CLASS_NAME should be used instead.

There should be no user projects that use CLASSNAME.  It was only added
for internal use for a transitional period.

Change-Id: I450f912c395907a72e2078b5d458c1c3bd115b8f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2022-06-29 14:10:00 +02:00
parent 626c3f56cf
commit 97fa1f24b9
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/Qt6CoreMacros.cmake
View File

@ -2402,24 +2402,8 @@ endmacro()
function(qt6_add_plugin target)
_qt_internal_get_add_plugin_keywords(opt_args single_args multi_args)
# TODO: Transitional use only, replaced by CLASS_NAME. Remove this once
# all other repos have been updated to use CLASS_NAME.
list(APPEND single_args CLASSNAME)
cmake_parse_arguments(PARSE_ARGV 1 arg "${opt_args}" "${single_args}" "${multi_args}")
# Handle the inconsistent CLASSNAME/CLASS_NAME keyword naming between commands
if(arg_CLASSNAME)
if(arg_CLASS_NAME AND NOT arg_CLASSNAME STREQUAL arg_CLASS_NAME)
message(FATAL_ERROR
"Both CLASSNAME and CLASS_NAME were given and were different. "
"Only one of the two should be used."
)
endif()
set(arg_CLASS_NAME "${arg_CLASSNAME}")
unset(arg_CLASSNAME)
endif()
# 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)