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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
This commit is contained in:
Eike Ziller
2017-10-25 16:07:21 +02:00
parent 81f5c1c8ec dd60923713
commit 7f626b1182
108 changed files with 964 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,6 +265,8 @@ public:
return m_qbsCleanStep->keepGoing();
}
bool forceProbeExecution() const { return m_qbsBuildStep && m_qbsBuildStep->forceProbes(); }
bool showCommandLines() const {
return m_qbsBuildStep ? m_qbsBuildStep->showCommandLines() : false;
}
@@ -328,6 +330,8 @@ QString QbsBuildConfiguration::equivalentCommandLine(const BuildStep *buildStep)
Utils::QtcProcess::addArg(&commandLine, QLatin1String("--dry-run"));
if (stepProxy.keepGoing())
Utils::QtcProcess::addArg(&commandLine, QLatin1String("--keep-going"));
if (stepProxy.forceProbeExecution())
Utils::QtcProcess::addArg(&commandLine, QLatin1String("--force-probe-execution"));
if (stepProxy.showCommandLines())
Utils::QtcProcess::addArgs(&commandLine, QStringList({"--command-echo-mode",
"command-line"}));

2
src/plugins/qbsprojectmanager/qbskitinformation.h
View File

@@ -32,6 +32,8 @@ namespace Internal {
class QbsKitInformation final : public ProjectExplorer::KitInformation
{
Q_OBJECT
public:
static QString displayName();
static QString representation(const ProjectExplorer::Kit *kit);