From 356b0aee0e93c9fc51e79faa8d6904bf4d5a6c27 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 29 Feb 2024 12:10:57 +0100 Subject: [PATCH] Disable depfile support for the external projects when building for Android androiddeployqt rules that support depfiles cause creation of rules that interfere each other and cause the test build flakiness in CI. This disables depfile support for ABI-specific external project until the rootcase is found. Task-number: QTBUG-122838 Pick-to: 6.5 6.6 6.7 Change-Id: I12e85f43494331c943c9b516d9494593facf9180 Reviewed-by: Assam Boudjelthia --- src/corelib/Qt6AndroidMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index d2b0c59d553..08366d89f7b 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -576,7 +576,7 @@ function(qt6_android_add_apk_target target) "$" "${androiddeployqt_output_path}/${target_file_copy_relative_path}" ) - if(has_depfile_support) + if(has_depfile_support AND FALSE) # TODO: It breaks multi-abi builds. See QTBUG-122838 set(deploy_android_deps_dir "${apk_final_dir}/${target}_deploy_android") set(timestamp_file "${deploy_android_deps_dir}/timestamp") set(dep_file "${deploy_android_deps_dir}/${target}.d")