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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
This commit is contained in:
Eike Ziller
2016-08-22 16:30:49 +02:00
parent f41b48ef5d e87da5a08a
commit 841778ed69
19 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -121,6 +121,7 @@ QmakeBuildConfiguration *QMakeStep::qmakeBuildConfiguration() const
/// user arguments
QString QMakeStep::allArguments(const BaseQtVersion *v, bool shorted) const
{
QTC_ASSERT(v, return QString());
QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
QStringList arguments;
if (bc->subNodeBuild())
@@ -482,9 +483,12 @@ QString QMakeStep::effectiveQMakeCall() const
if (make.isEmpty())
make = tr("<no Make step found>");
QString result = qmake + QLatin1Char(' ') + allArguments(qtVersion);
if (qtVersion->qtVersion() >= QtVersionNumber(5, 0, 0))
result.append(QString::fromLatin1(" && %1 %2").arg(make).arg(makeArguments()));
QString result = qmake;
if (qtVersion) {
result += QLatin1Char(' ') + allArguments(qtVersion);
if (qtVersion->qtVersion() >= QtVersionNumber(5, 0, 0))
result.append(QString::fromLatin1(" && %1 %2").arg(make).arg(makeArguments()));
}
return result;
}