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);
}
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;
}