diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-08 11:35:42 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-08 16:05:38 +0200 |
| commit | 50fe714078db85eca99be374847d2e0807bc8108 (patch) | |
| tree | f87ab5ce4cb3a414db4fc024c905adb0c0f6f11b /src | |
| parent | bdee2a862f9d9acc38b9a58b85a86fca0d2b38c2 (diff) | |
Fix invocation of qmlcachegen
--direct-calls and --qmljs-runtime do not expect any further arguments.
Furthermore, the qmlcachegen invocation depends on the qmltypes file for
the same module.
Change-Id: Ib28a0c931a09986f96f426d4098b25243b82a7b4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 116d6a65a4..2e50b43111 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -1195,8 +1195,8 @@ function(qt6_target_qml_sources target) set(cachegen_args "$<${have_import_paths}:${import_paths}>" "$<${have_types_file}:-i$<SEMICOLON>${types_file}>" - "$<${have_direct_calls}:--direct-calls$<SEMICOLON>${direct_calls}>" - "$<${have_qmljs_runtime}:--qmljs-runtime$<SEMICOLON>${qmljs_runtime}>" + "$<${have_direct_calls}:--direct-calls>" + "$<${have_qmljs_runtime}:--qmljs-runtime>" ) endif() @@ -1362,7 +1362,7 @@ function(qt6_target_qml_sources target) DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::qmlcachegen "${file_absolute}" - "$<$<BOOL:${qmltypes}>:${qmltypes}>" + "$<$<BOOL:${types_file}>:${types_file}>" ) target_sources(${target} PRIVATE |