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

QMake: Use option for parallel make jobs

Browse Source 
The job option was already available in MakeStep::allArguments(),
but not in MakeStep::userArguments() which is used by QmakeMakeStep.

So while the job option was already correctly set in the projects
setup widget, it was not used.

Amends 005b0c1147

Change-Id: I39799f9d1c65bf78884f5bc4c58cb66d803785bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Andre Hartmann
2018-10-21 12:39:43 +02:00
committed by André Hartmann
parent 8e54095d07
commit 30b3b1c6e0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakemakestep.cpp
View File

@@ -129,7 +129,7 @@ bool QmakeMakeStep::init(QList<const BuildStep *> &earlierSteps)
} }
} }
Utils::QtcProcess::addArgs(&args, userArguments()); Utils::QtcProcess::addArgs(&args, allArguments());
if (bc->fileNodeBuild() && subProFile) { if (bc->fileNodeBuild() && subProFile) {
QString objectsDir = subProFile->objectsDirectory(); QString objectsDir = subProFile->objectsDirectory();
if (objectsDir.isEmpty()) { if (objectsDir.isEmpty()) {