diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2024-04-02 16:23:28 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2024-05-10 11:03:49 +0200 |
commit | 3577daf34df5a2dc750582b1ad4e4fae204c3461 (patch) | |
tree | 327d1906d5c767768e624ddd6fb947f081b6fac6 | |
parent | ec18526c617b517d176080ce378ec2e0083f3cc4 (diff) |
Purge remaining support for SKIP_TYPE_REGISTRATION
Change-Id: Ibbb3fed58d0fcd8c3e7f99b9a1150a24ab147620
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
-rw-r--r-- | src/qml/Qt6QmlBuildInternals.cmake | 1 | ||||
-rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/qml/Qt6QmlBuildInternals.cmake b/src/qml/Qt6QmlBuildInternals.cmake index 418b552692..7b181fabde 100644 --- a/src/qml/Qt6QmlBuildInternals.cmake +++ b/src/qml/Qt6QmlBuildInternals.cmake @@ -94,7 +94,6 @@ function(qt_internal_add_qml_module target) ) # TODO: Remove these once all repos have been updated to not use them set(ignore_option_args - SKIP_TYPE_REGISTRATION # Now always done PLUGIN_OPTIONAL # Now the default GENERATE_QMLTYPES # Now the default INSTALL_QMLTYPES # Now the default diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 5352f896f6..a64e2eea6b 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -30,8 +30,6 @@ function(qt6_add_qml_module target) NO_CACHEGEN NO_RESOURCE_TARGET_PATH NO_IMPORT_SCAN - # TODO: Remove once all usages have also been removed - SKIP_TYPE_REGISTRATION ENABLE_TYPE_COMPILER # Used to mark modules as having static side effects (i.e. if they install an image provider) @@ -112,12 +110,6 @@ function(qt6_add_qml_module target) ) endif() - if(arg_SKIP_TYPE_REGISTRATION) - message(AUTHOR_WARNING - "SKIP_TYPE_REGISTRATION is no longer used and will be ignored." - ) - endif() - # Mandatory arguments if (NOT arg_URI) message(FATAL_ERROR |