feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update qbs submodule.

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

Change-Id: I906918223de3946ae532ae4042c2545dd53b66cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2016-06-27 16:16:47 +02:00
parent 23b3bb5814
commit 700239c681
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -309,12 +309,16 @@ QString QbsBuildConfiguration::equivalentCommandLine(const BuildStep *buildStep)
<< installRoot); << installRoot);
} }
const QString profileName = QbsManager::instance()->profileForKit(buildStep->target()->kit());
if (buildConfig) { if (buildConfig) {
Utils::QtcProcess::addArg(&commandLine, buildConfig->qbsConfiguration() const QString buildVariant = buildConfig->qbsConfiguration()
.value(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)).toString()); .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:") Utils::QtcProcess::addArg(&commandLine, QLatin1String("profile:") + profileName);
+ QbsManager::instance()->profileForKit(buildStep->target()->kit()));
return commandLine; return commandLine;
} }

1
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -576,6 +576,7 @@ void QbsBuildStepConfigWidget::updatePropertyEdit(const QVariantMap &data)
editable.remove(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)); editable.remove(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY));
editable.remove(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY)); editable.remove(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY));
editable.remove(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY)); editable.remove(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY));
editable.remove(QLatin1String(Constants::QBS_FORCE_PROBES_KEY));
QStringList propertyList; QStringList propertyList;
for (QVariantMap::const_iterator i = editable.constBegin(); i != editable.constEnd(); ++i) for (QVariantMap::const_iterator i = editable.constBegin(); i != editable.constEnd(); ++i)

5
src/plugins/qbsprojectmanager/qbsprojectparser.cpp
View File

@@ -86,8 +86,9 @@ void QbsProjectParser::parse(const QVariantMap &config, const Environment &env,
QString specialKey = QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY); QString specialKey = QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY);
const QString profileName = userConfig.take(specialKey).toString(); const QString profileName = userConfig.take(specialKey).toString();
params.setTopLevelProfile(profileName); params.setTopLevelProfile(profileName);
specialKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY); const QString buildVariantKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY);
params.setBuildVariant(userConfig.take(specialKey).toString()); const QString buildVariant = userConfig.value(buildVariantKey).toString();
params.setConfigurationName(profileName + QLatin1Char('-') + buildVariant);
specialKey = QLatin1String(Constants::QBS_FORCE_PROBES_KEY); specialKey = QLatin1String(Constants::QBS_FORCE_PROBES_KEY);
params.setForceProbeExecution(userConfig.take(specialKey).toBool()); params.setForceProbeExecution(userConfig.take(specialKey).toBool());
params.setSettingsDirectory(QbsManager::settings()->baseDirectory()); params.setSettingsDirectory(QbsManager::settings()->baseDirectory());

2
src/shared/qbs

Submodule src/shared/qbs updated: 1a103f7a90...129e7a8ab1