1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch tools and apps to non-strict C++ builds too

Browse Source 
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 <ivan.solovev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7e37962cd0d1faf65249e08020619ef7175a280e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2024-08-20 11:25:26 -07:00 committed by Qt Cherry-pick Bot
parent a2b94167ab
commit d6bef9a6f9
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtAppHelpers.cmake
View File

@ -94,7 +94,6 @@ function(qt_internal_add_app target)
# qt_set_target_info_properties knows how to process them # qt_set_target_info_properties knows how to process them
) )
qt_internal_add_target_aliases("${target}") qt_internal_add_target_aliases("${target}")
_qt_internal_apply_strict_cpp("${target}")
qt_internal_adjust_main_config_runtime_output_dir("${target}" "${output_directory}") 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, # To mimic the default behaviors of qt_app.prf, we by default enable GUI Windows applications,

1
cmake/QtToolHelpers.cmake
View File

@ -143,7 +143,6 @@ function(qt_internal_add_tool target_name)
# qt_set_target_info_properties knows how to process them # qt_set_target_info_properties knows how to process them
) )
qt_internal_add_target_aliases("${target_name}") 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}") qt_internal_adjust_main_config_runtime_output_dir("${target_name}" "${output_dir}")
if (WIN32) if (WIN32)