Commit 700239c6 authored by Christian Kandeler's avatar Christian Kandeler

Update qbs submodule.

To HEAD of master branch. Plus some necessary adaptations due to API
change.

Change-Id: I906918223de3946ae532ae4042c2545dd53b66cc
Reviewed-by: Joerg Bornemann's avatarJoerg Bornemann <joerg.bornemann@qt.io>
parent 23b3bb58
......@@ -309,12 +309,16 @@ QString QbsBuildConfiguration::equivalentCommandLine(const BuildStep *buildStep)
<< installRoot);
}
const QString profileName = QbsManager::instance()->profileForKit(buildStep->target()->kit());
if (buildConfig) {
Utils::QtcProcess::addArg(&commandLine, buildConfig->qbsConfiguration()
.value(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)).toString());
const QString buildVariant = buildConfig->qbsConfiguration()
.value(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)).toString();
const QString configName = profileName + QLatin1Char('-') + buildVariant;
Utils::QtcProcess::addArg(&commandLine, configName);
Utils::QtcProcess::addArg(&commandLine, QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)
+ QLatin1Char(':') + buildVariant);
}
Utils::QtcProcess::addArg(&commandLine, QLatin1String("profile:")
+ QbsManager::instance()->profileForKit(buildStep->target()->kit()));
Utils::QtcProcess::addArg(&commandLine, QLatin1String("profile:") + profileName);
return commandLine;
}
......
......@@ -576,6 +576,7 @@ void QbsBuildStepConfigWidget::updatePropertyEdit(const QVariantMap &data)
editable.remove(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY));
editable.remove(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY));
editable.remove(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY));
editable.remove(QLatin1String(Constants::QBS_FORCE_PROBES_KEY));
QStringList propertyList;
for (QVariantMap::const_iterator i = editable.constBegin(); i != editable.constEnd(); ++i)
......
......@@ -86,8 +86,9 @@ void QbsProjectParser::parse(const QVariantMap &config, const Environment &env,
QString specialKey = QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY);
const QString profileName = userConfig.take(specialKey).toString();
params.setTopLevelProfile(profileName);
specialKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY);
params.setBuildVariant(userConfig.take(specialKey).toString());
const QString buildVariantKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY);
const QString buildVariant = userConfig.value(buildVariantKey).toString();
params.setConfigurationName(profileName + QLatin1Char('-') + buildVariant);
specialKey = QLatin1String(Constants::QBS_FORCE_PROBES_KEY);
params.setForceProbeExecution(userConfig.take(specialKey).toBool());
params.setSettingsDirectory(QbsManager::settings()->baseDirectory());
......
Subproject commit 1a103f7a90b51022aa10da228deb566cd7b446ca
Subproject commit 129e7a8ab1edfb583157db6050ab3f1bd426279e
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