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

Qmake: Use local Makefile path when constructing make command

Browse Source 
The command will be executed by qmake and make steps on the build device,
from that perspective the Makefile path is local.

Change-Id: I7a72002126975ea462daf528f2c1f490d433af77
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-06-03 12:49:17 +02:00
parent 0dbed86651
commit 1fd18e31c1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,9 @@ bool QMakeStep::init()
m_qmakeCommand = CommandLine{qtVersion->qmakeCommand(), allArguments(qtVersion), CommandLine::Raw};
m_runMakeQmake = (qtVersion->qtVersion() >= QtVersionNumber(5, 0 ,0));
QString makefile = workingDirectory.toString() + '/';
// The Makefile is used by qmake and make on the build device, from that
// perspective it is local.
QString makefile = workingDirectory.path() + '/';
if (qmakeBc->subNodeBuild()) {
QmakeProFileNode *pro = qmakeBc->subNodeBuild();