diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-08-02 14:39:43 +1000 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-08-03 16:52:36 +1000 |
| commit | c6849e80a4bb3c96c91ff114b6b17c3a68d8a986 (patch) | |
| tree | 037b03765005184d53390e005582f3caca3c0509 /tools | |
| parent | 7fffac536ce117ca5ebc5ca9b505744927c385d8 (diff) | |
Add NO_PLUGIN option to qt6_add_qml_module()
The new option allows the caller to state more clearly that they do not
want a plugin at all. Previously, the NO_CREATE_PLUGIN_TARGET option
had to be given to prevent the command from trying to create a plugin
target, but that option is meant for when the project will create the
plugin target later.
Now that the caller has a way to explicitly say they don't want a
plugin, require PLUGIN_TARGET to be given if NO_CREATE_PLUGIN_TARGET
is present. This forces the project to provide the name of the plugin
target that they will be responsible for creating.
Fixes: QTBUG-95141
Change-Id: I84e036074f3e2785f17a8d33ad87ee0b7e016173
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 73c76005e64d92ff5e3ef7d2a578b1d7a14b3d5f)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/qmltime/CMakeLists.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index 099f3dc68d..e719b0b49b 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -52,7 +52,6 @@ qt_internal_add_resource(${target_name} "qml" qt6_add_qml_module(${target_name} URI QmlRuntime.Config VERSION 1.0 - NO_CREATE_PLUGIN_TARGET ) qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Gui diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt index e8d2ff8f57..d4569af23a 100644 --- a/tools/qmltime/CMakeLists.txt +++ b/tools/qmltime/CMakeLists.txt @@ -27,5 +27,4 @@ endif() qt6_add_qml_module(${target_name} URI QmlTime VERSION 1.0 - NO_CREATE_PLUGIN_TARGET ) |