From 555d94cda0d7dd5630e977e57a8a4eaec3022883 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 10 Jan 2025 18:24:52 +0100 Subject: [PATCH] Use `_qt_internal_relative_path` Change-Id: I1c4248bbf7e06536503224cbfceb57f41de019bc Reviewed-by: Alexandru Croitor (cherry picked from commit 1192f2c87778c90530553cc62e763afaa0b6456e) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 430779a28767cfd4429864b17a3fb9933c016490) --- src/widgets/Qt6WidgetsMacros.cmake | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/widgets/Qt6WidgetsMacros.cmake b/src/widgets/Qt6WidgetsMacros.cmake index 1ce4cdb6619..50baad15613 100644 --- a/src/widgets/Qt6WidgetsMacros.cmake +++ b/src/widgets/Qt6WidgetsMacros.cmake @@ -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)