From cd78cf27a19ecd20cfc3ad44b593b21d1ae2f249 Mon Sep 17 00:00:00 2001 From: Even Oscar Andersen Date: Mon, 24 Jun 2024 11:41:45 +0200 Subject: wasm: Fix conflict usage for tst_qwasmwindow_harness.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- cmake/QtTestHelpers.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'cmake/QtTestHelpers.cmake') 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() -- cgit v1.2.3