Commit 83271710 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Update qbs submodule.



To HEAD of master branch. Also adapt QbsProjectManager to API changes.

Change-Id: I22eb0c0966685fc26a3c6c143fd3d2d5cb4fab8d
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 71df6410
......@@ -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;
......
Subproject commit 243964aae9496922e400f84bd7a1a3ed3f674e96
Subproject commit 6d72bca8f84ff2b9a83a34a361acc3a4d510ad74
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment