lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

init-repository: Fix passing no --alternates option

Browse Source 
Commit d6918d7ac5 broke init-repository if
you did not pass an --alternates option.

Pick-to: 6.8
Task-number: QTBUG-142712
Fixes: QTBUG-142744
Change-Id: Ia727b420a34a46e52f0f05e549aabe2c975c6d7e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 6bd3b23b6c)
(cherry picked from commit f1d54f955c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann
2025-12-15 13:21:56 +01:00
committed by Qt Cherry-pick Bot
parent 30ee3ee4b2
commit ca679e98de
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/QtIRCommandLineHelpers.cmake
View File

@@ -427,11 +427,13 @@ endfunction()
# Convert to absolute path if necessary. # Convert to absolute path if necessary.
function(qt_ir_get_option_as_existing_absolute_path name value) function(qt_ir_get_option_as_existing_absolute_path name value)
qt_ir_get_option_value("${name}" path) qt_ir_get_option_value("${name}" path)
if(NOT EXISTS "${abspath}") if(NOT "${path}" STREQUAL "")
qt_ir_add_error("The path '${path}' passed with -${name} does not exist.") if(NOT EXISTS "${path}")
endif() qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
if(NOT IS_ABSOLUTE "${path}") endif()
get_filename_component(path "${path}" ABSOLUTE) if(NOT IS_ABSOLUTE "${path}")
get_filename_component(path "${path}" ABSOLUTE)
endif()
endif() endif()
set("${value}" "${path}" PARENT_SCOPE) set("${value}" "${path}" PARENT_SCOPE)
endfunction() endfunction()