From cc89b79bc25634a59bad89c571bf9761a1de0650 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 16 Jan 2023 10:12:43 +0100 Subject: [PATCH] QbsPM: Fix handling of executable path To be able to act correctly the internals of FilePath need to be formatted in UNIX style. Kind of amends c08317b5a673b7. Change-Id: I5a0c7b06005901575d47b9de327eeb657dbe3090 Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 4 ++-- src/plugins/qbsprojectmanager/qbsproject.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 2252fb35aca..067cd1d9d0b 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -387,11 +387,11 @@ Utils::FilePath QbsBuildStep::installRoot(VariableHandling variableHandling) con const QString root = qbsConfiguration(variableHandling).value(Constants::QBS_INSTALL_ROOT_KEY).toString(); if (!root.isNull()) - return Utils::FilePath::fromString(root); + return Utils::FilePath::fromUserInput(root); QString defaultInstallDir = QbsSettings::defaultInstallDirTemplate(); if (variableHandling == VariableHandling::ExpandVariables) defaultInstallDir = macroExpander()->expand(defaultInstallDir); - return FilePath::fromString(defaultInstallDir); + return FilePath::fromUserInput(defaultInstallDir); } int QbsBuildStep::maxJobs() const diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 6c6a7febf5f..dc9caef34c0 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -498,7 +498,7 @@ FilePath QbsBuildSystem::installRoot() if (!step->enabled()) continue; if (const auto qbsInstallStep = qobject_cast(step)) - return FilePath::fromString(qbsInstallStep->installRoot()); + return FilePath::fromUserInput(qbsInstallStep->installRoot()); } } const QbsBuildStep * const buildStep = m_buildConfiguration->qbsStep();