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 1.5 branch. Also do the necessary
adaptations in the QbsProjectManager plugin.

Change-Id: Ic4c756b7f6134b9c61bad9635ac25c1e33c75825
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
BogDan Vatra
2016-01-29 10:51:15 +02:00
committed by Christian Kandeler
parent 869c46227d
commit 4f04900f45
6 changed files with 3 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,10 +257,6 @@ public:
return m_qbsBuildStep ? m_qbsBuildStep->maxJobs() : 0;
}
bool allArtifacts() const {
return m_qbsCleanStep ? m_qbsCleanStep->cleanAll() : false;
}
QString installRoot() const {
return m_qbsInstallStep ? m_qbsInstallStep->absoluteInstallRoot() : QString();
}
@@ -308,8 +304,6 @@ QString QbsBuildConfiguration::equivalentCommandLine(const BuildStep *buildStep)
Utils::QtcProcess::addArgs(&commandLine, QStringList() << QLatin1String("--jobs")
<< QString::number(jobCount));
}
if (stepProxy.allArtifacts())
Utils::QtcProcess::addArg(&commandLine, QLatin1String("--all-artifacts"));
const QString installRoot = stepProxy.installRoot();
if (!installRoot.isEmpty()) {
Utils::QtcProcess::addArgs(&commandLine, QStringList() << QLatin1String("--install-root")