feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsPM: Fix handling of executable path

Browse Source 
To be able to act correctly the internals of FilePath need to be
formatted in UNIX style.
Kind of amends c08317b5a6.

Change-Id: I5a0c7b06005901575d47b9de327eeb657dbe3090
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2023-01-16 10:12:43 +01:00
parent f7f9d5d405
commit cc89b79bc2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -387,11 +387,11 @@ Utils::FilePath QbsBuildStep::installRoot(VariableHandling variableHandling) con
const QString root = const QString root =
qbsConfiguration(variableHandling).value(Constants::QBS_INSTALL_ROOT_KEY).toString(); qbsConfiguration(variableHandling).value(Constants::QBS_INSTALL_ROOT_KEY).toString();
if (!root.isNull()) if (!root.isNull())
return Utils::FilePath::fromString(root); return Utils::FilePath::fromUserInput(root);
QString defaultInstallDir = QbsSettings::defaultInstallDirTemplate(); QString defaultInstallDir = QbsSettings::defaultInstallDirTemplate();
if (variableHandling == VariableHandling::ExpandVariables) if (variableHandling == VariableHandling::ExpandVariables)
defaultInstallDir = macroExpander()->expand(defaultInstallDir); defaultInstallDir = macroExpander()->expand(defaultInstallDir);
return FilePath::fromString(defaultInstallDir); return FilePath::fromUserInput(defaultInstallDir);
} }
int QbsBuildStep::maxJobs() const int QbsBuildStep::maxJobs() const

2
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -498,7 +498,7 @@ FilePath QbsBuildSystem::installRoot()
if (!step->enabled()) if (!step->enabled())
continue; continue;
if (const auto qbsInstallStep = qobject_cast<const QbsInstallStep *>(step)) if (const auto qbsInstallStep = qobject_cast<const QbsInstallStep *>(step))
return FilePath::fromString(qbsInstallStep->installRoot()); return FilePath::fromUserInput(qbsInstallStep->installRoot());
} }
} }
const QbsBuildStep * const buildStep = m_buildConfiguration->qbsStep(); const QbsBuildStep * const buildStep = m_buildConfiguration->qbsStep();