From 1fd18e31c1aa008611d38c475978ff61762363b7 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 3 Jun 2021 12:49:17 +0200 Subject: [PATCH] Qmake: Use local Makefile path when constructing make command 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 --- src/plugins/qmakeprojectmanager/qmakestep.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index e8c53d2315b..d24f190de7d 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -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();