From d6bef9a6f91343cc1c3f0d652c0609f51334580c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 20 Aug 2024 11:25:26 -0700 Subject: [PATCH] Switch tools and apps to non-strict C++ builds too This complements commit 30e04340dac26ebd09f9bc8ceb598e873ab63ba7 ("Switch to non-strict C++ builds so QT_SUPPORTS_INT128 is true") and adds the same modification to tools and apps. Otherwise qtconnectivity's sdspscanner won't compile, as it needs quint128. Task-number: QTBUG-119901 Change-Id: Ib9a6fe573e9420a471fdfffd76a2e43d3c5496d8 Reviewed-by: Ivan Solovev Reviewed-by: Alexandru Croitor (cherry picked from commit 7e37962cd0d1faf65249e08020619ef7175a280e) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtAppHelpers.cmake | 1 - cmake/QtToolHelpers.cmake | 1 - 2 files changed, 2 deletions(-) diff --git a/cmake/QtAppHelpers.cmake b/cmake/QtAppHelpers.cmake index eb29030e304..de6cd072336 100644 --- a/cmake/QtAppHelpers.cmake +++ b/cmake/QtAppHelpers.cmake @@ -94,7 +94,6 @@ function(qt_internal_add_app target) # qt_set_target_info_properties knows how to process them ) qt_internal_add_target_aliases("${target}") - _qt_internal_apply_strict_cpp("${target}") qt_internal_adjust_main_config_runtime_output_dir("${target}" "${output_directory}") # To mimic the default behaviors of qt_app.prf, we by default enable GUI Windows applications, diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake index b8713165b77..a974b6784ae 100644 --- a/cmake/QtToolHelpers.cmake +++ b/cmake/QtToolHelpers.cmake @@ -143,7 +143,6 @@ function(qt_internal_add_tool target_name) # qt_set_target_info_properties knows how to process them ) qt_internal_add_target_aliases("${target_name}") - _qt_internal_apply_strict_cpp("${target_name}") qt_internal_adjust_main_config_runtime_output_dir("${target_name}" "${output_dir}") if (WIN32)