From cb2f5520d9cd73a09cdf10e13eb1d6eb8e0c3d4e Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 5 Mar 2020 13:32:11 +0100 Subject: [PATCH] QbsProjectManager: Fix default install root We forgot to append the "/install-root" directory at the end. Change-Id: I1ad0d547f097a6b9c954603d394a5182368633a7 Reviewed-by: Joerg Bornemann --- src/plugins/qbsprojectmanager/qbssettings.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbssettings.cpp b/src/plugins/qbsprojectmanager/qbssettings.cpp index 34831b6cbe1..3a7b97a98e0 100644 --- a/src/plugins/qbsprojectmanager/qbssettings.cpp +++ b/src/plugins/qbsprojectmanager/qbssettings.cpp @@ -117,8 +117,9 @@ void QbsSettings::loadSettings() { QSettings * const s = Core::ICore::settings(); m_settings.qbsExecutableFilePath = FilePath::fromString(s->value(QBS_EXE_KEY).toString()); - m_settings.defaultInstallDirTemplate = s->value(QBS_DEFAULT_INSTALL_DIR_KEY, - "%{CurrentBuild:QbsBuildRoot}").toString(); + m_settings.defaultInstallDirTemplate = s->value( + QBS_DEFAULT_INSTALL_DIR_KEY, + "%{CurrentBuild:QbsBuildRoot}/install-root").toString(); m_settings.useCreatorSettings = s->value(USE_CREATOR_SETTINGS_KEY, true).toBool(); }