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

CMake: Remove qt_internal_qt_configure_end workaround

Browse Source 
Now that the top-level build calls qt_internal_qt_configure_end
itself, we don't need to call it in qt_print_build_instructions.

Change-Id: I906ee7bc1aed3b597049b5996a41dd298175343c
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 28516ed1fdf52665886f6005766257776453e584)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2023-09-01 18:34:12 +02:00 committed by Qt Cherry-pick Bot
parent 1084d008d3
commit 96e9d5cd76
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtBaseTopLevelHelpers.cmake
View File

@ -18,10 +18,6 @@ macro(qt_internal_top_level_setup_autodetect)
endmacro() endmacro()
macro(qt_internal_top_level_setup_after_project) macro(qt_internal_top_level_setup_after_project)
# TODO: Remove this variable once the top-level calls this function and
# qt_internal_qt_configure_end is not called in qt_print_build_instructions anymore.
set(__qt6_top_level_after_project_called TRUE)
qt_internal_top_level_setup_testing() qt_internal_top_level_setup_testing()
endmacro() endmacro()

7
cmake/QtBuildInformation.cmake
View File

@ -111,13 +111,6 @@ from the build directory")
if(QT_SUPERBUILD) if(QT_SUPERBUILD)
qt_internal_save_previously_visited_packages() qt_internal_save_previously_visited_packages()
endif() endif()
# TODO: Abuse qt_print_build_instructions being called as the last command in a top-level build.
# Instead we should call this explicitly at the end of the top-level project.
# TODO: Remove this once the top-level calls qt_internal_top_level_setup_after_project
if(QT_SUPERBUILD AND NOT __qt6_top_level_after_project_called)
qt_internal_qt_configure_end()
endif()
endfunction() endfunction()
function(qt_configure_print_summary_helper summary_reports force_show) function(qt_configure_print_summary_helper summary_reports force_show)