diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp index f0b37fc6fcb..2059690c169 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp @@ -84,16 +84,15 @@ bool QbsProjectParser::parse(const QVariantMap &config, const Environment &env, m_currentProgressBase = 0; qbs::SetupProjectParameters params; - QVariantMap baseConfig; QVariantMap userConfig = config; QString specialKey = QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY); const QString profileName = userConfig.take(specialKey).toString(); - baseConfig.insert(specialKey, profileName); + params.setTopLevelProfile(profileName); specialKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY); - baseConfig.insert(specialKey, userConfig.take(specialKey)); - params.setBuildConfiguration(baseConfig); + params.setBuildVariant(userConfig.take(specialKey).toString()); + params.setSettingsDirectory(QbsManager::settings()->baseDirectoy()); params.setOverriddenValues(userConfig); - m_error = params.expandBuildConfiguration(QbsManager::settings()); + m_error = params.expandBuildConfiguration(); if (m_error.hasError()) { emit done(false); return false; diff --git a/src/shared/qbs b/src/shared/qbs index 243964aae94..6d72bca8f84 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 243964aae9496922e400f84bd7a1a3ed3f674e96 +Subproject commit 6d72bca8f84ff2b9a83a34a361acc3a4d510ad74