diff options
| author | Even Oscar Andersen <[email protected]> | 2024-06-24 11:41:45 +0200 |
|---|---|---|
| committer | Even Oscar Andersen <[email protected]> | 2024-09-05 17:28:19 +0200 |
| commit | cd78cf27a19ecd20cfc3ad44b593b21d1ae2f249 (patch) | |
| tree | 8b44341c7e8f0fd7cdb7cac1d4331c9c5c09f6b3 /cmake/QtTestHelpers.cmake | |
| parent | 00ce86a90815443562bebd68277bda77972bc65d (diff) | |
wasm: Fix conflict usage for tst_qwasmwindow_harness.html
There is a default tst_qwasmwindow_harness.html created, and we have
our own in addition. This creates problems if one runs configure
and do not perform a clean build afterwards as we would be
left with the autogenerated file.
The solution is to rename our custom file so that there is
no conflict.
Change-Id: I1f0436eea752059d4dcf22407c760339eed46c09
Reviewed-by: Piotr Wierciński <[email protected]>
Diffstat (limited to 'cmake/QtTestHelpers.cmake')
| -rw-r--r-- | cmake/QtTestHelpers.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 2885b1508c6..071986122d9 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -217,6 +217,7 @@ function(qt_internal_get_test_arg_definitions optional_args single_value_args mu NO_BATCH NO_INSTALL BUNDLE_ANDROID_OPENSSL_LIBS + NO_WASM_DEFAULT_FILES PARENT_SCOPE ) set(${single_value_args} @@ -587,6 +588,13 @@ function(qt_internal_add_test name) endif() endif() + if (arg_NO_WASM_DEFAULT_FILES) + set_target_properties( + ${name} + PROPERTIES + NO_WASM_DEFAULT_FILES True) + endif() + foreach(path IN LISTS arg_QML_IMPORTPATH) list(APPEND extra_test_args "-import" "${path}") endforeach() |