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

Use _qt_internal_relative_path

Browse Source 
Pick-to: 6.8
Change-Id: I1c4248bbf7e06536503224cbfceb57f41de019bc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 1192f2c87778c90530553cc62e763afaa0b6456e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Cristian Le 2025-01-10 18:24:52 +01:00 committed by Qt Cherry-pick Bot
parent b8fa115b47
commit 430779a287
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/Qt6WidgetsMacros.cmake
View File

@ -130,13 +130,10 @@ function(qt6_add_ui target)
"${raw_include_prefix_to_compare}")
endif()
file(RELATIVE_PATH normalized_include_prefix
"${dummy_path_for_relative_calculation}"
"${raw_include_prefix_to_compare}")
# if normalized_include_prefix ends with `/` remove it
string(REGEX REPLACE "/$" "" normalized_include_prefix
"${normalized_include_prefix}")
_qt_internal_relative_path(raw_include_prefix_to_compare
BASE_DIRECTORY "${dummy_path_for_relative_calculation}"
OUTPUT_VARIABLE normalized_include_prefix
)
_qt_internal_generate_dash_path_from_input("${normalized_include_prefix}"
additional_path)