diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-06-29 14:31:23 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-07-11 20:32:13 +0200 |
| commit | 2cf1b290d7fd40690a61c06e3fd34da9a1c75e4f (patch) | |
| tree | 36c5a35d7dc4a8e03c5c10ceeb4e64d452bce5e5 /src/qml/Qt6QmlBuildInternals.cmake | |
| parent | 974ea1716fc195e90941ded7fa962204c14fee15 (diff) | |
CMake: Remove support for the deprecated CLASSNAME keyword
...in qt6_add_qml_module and qt_internal_add_qml_module.
[ChangeLog][QtQml] The deprecated CLASSNAME argument of
qt_add_qml_module has been removed in favor of CLASS_NAME.
Change-Id: I55b5e5bda10d0e416e3c3c6f381245dd5df0ff29
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/Qt6QmlBuildInternals.cmake')
| -rw-r--r-- | src/qml/Qt6QmlBuildInternals.cmake | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/qml/Qt6QmlBuildInternals.cmake b/src/qml/Qt6QmlBuildInternals.cmake index 93761d7a90..fdc199f423 100644 --- a/src/qml/Qt6QmlBuildInternals.cmake +++ b/src/qml/Qt6QmlBuildInternals.cmake @@ -31,8 +31,6 @@ macro(qt_internal_get_internal_add_qml_module_keywords PLUGIN_TARGET TYPEINFO CLASS_NAME - CLASSNAME # TODO: Remove once all other repos have been updated to use - # CLASS_NAME instead. TYPE_COMPILER_NAMESPACE ) set(${multi_args} @@ -140,18 +138,6 @@ function(qt_internal_add_qml_module target) set(arg_PLUGIN_TARGET ${target}plugin) endif() - # TODO: Support for old keyword, remove once all repos no longer use CLASSNAME - 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. " - "Update call site to only use CLASS_NAME." - ) - endif() - set(arg_CLASS_NAME "${arg_CLASSNAME}") - unset(arg_CLASSNAME) - endif() - set(plugin_args "") if(arg_NO_PLUGIN OR NOT arg_PLUGIN_TARGET STREQUAL target) # Allow using an existing backing target. @@ -199,7 +185,6 @@ function(qt_internal_add_qml_module target) OUTPUT_DIRECTORY INSTALL_DIRECTORY CLASS_NAME - CLASSNAME ALL_ARGS ${option_args} ${single_args} |