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

QbsPM: Silence soft assert

Browse Source 
Expanded macros may be original path strings and can contain
backslashes as file separator on Windows.

Change-Id: Ia4b1798e2e6ad42b0924a92f8efc254ea79fb7ad
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2025-02-12 08:32:46 +01:00
parent 5bc76999b5
commit 3d065495b3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -640,7 +640,7 @@ void QbsBuildSystem::startParsing(const QVariantMap &extraConfig)
installRoot = buildConfiguration()->macroExpander()->expand( installRoot = buildConfiguration()->macroExpander()->expand(
QbsSettings::defaultInstallDirTemplate()); QbsSettings::defaultInstallDirTemplate());
} }
config.insert(Constants::QBS_INSTALL_ROOT_KEY, FilePath::fromString(installRoot).path()); config.insert(Constants::QBS_INSTALL_ROOT_KEY, FilePath::fromUserInput(installRoot).path());
config.insert(Constants::QBS_RESTORE_BEHAVIOR_KEY, "restore-and-track-changes"); config.insert(Constants::QBS_RESTORE_BEHAVIOR_KEY, "restore-and-track-changes");
for (auto it = extraConfig.begin(); it != extraConfig.end(); ++it) for (auto it = extraConfig.begin(); it != extraConfig.end(); ++it)
config.insert(keyFromString(it.key()), it.value()); config.insert(keyFromString(it.key()), it.value());