QbsProjectManager: Let users provide a default install root

Fixes: QTCREATORBUG-12983
Change-Id: I016d298aaf8abc0d96267115225ab825bdd039e9
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-11-21 17:07:11 +01:00
parent fd8afd564f
commit 142d4ddb28
5 changed files with 34 additions and 7 deletions

View File

@@ -35,6 +35,7 @@
#include "qbsprojectmanagerconstants.h"
#include "qbsnodetreebuilder.h"
#include "qbssession.h"
#include "qbssettings.h"
#include <coreplugin/documentmanager.h>
#include <coreplugin/icontext.h>
@@ -592,6 +593,10 @@ void QbsBuildSystem::parseCurrentBuildConfiguration()
}
QVariantMap config = m_buildConfiguration->qbsConfiguration();
if (!config.contains(Constants::QBS_INSTALL_ROOT_KEY)) {
config.insert(Constants::QBS_INSTALL_ROOT_KEY, m_buildConfiguration->macroExpander()
->expand(QbsSettings::defaultInstallDirTemplate()));
}
Environment env = m_buildConfiguration->environment();
QString dir = m_buildConfiguration->buildDirectory().toString();