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

QMake: Fix building of remote projects

Browse Source 
Task-number: QTCREATORBUG-28355
Change-Id: I7e4a5b1b74fe7c95f8c56eb512a1714d2afb0a70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-11-29 18:34:46 +01:00
parent 5e50b9d604
commit 8679138f73
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,11 +115,11 @@ QString QMakeStep::allArguments(const QtVersion *v, ArgumentFlags flags) const
QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
QStringList arguments; QStringList arguments;
if (bc->subNodeBuild()) if (bc->subNodeBuild())
arguments << bc->subNodeBuild()->filePath().toUserOutput(); arguments << bc->subNodeBuild()->filePath().nativePath();
else if (flags & ArgumentFlag::OmitProjectPath) else if (flags & ArgumentFlag::OmitProjectPath)
arguments << project()->projectFilePath().fileName(); arguments << project()->projectFilePath().fileName();
else else
arguments << project()->projectFilePath().toUserOutput(); arguments << project()->projectFilePath().nativePath();
if (v->qtVersion() < QVersionNumber(5, 0, 0)) if (v->qtVersion() < QVersionNumber(5, 0, 0))
arguments << "-r"; arguments << "-r";
@@ -415,10 +415,10 @@ QString QMakeStep::effectiveQMakeCall() const
QtVersion *qtVersion = QtKitAspect::qtVersion(kit()); QtVersion *qtVersion = QtKitAspect::qtVersion(kit());
FilePath qmake = qtVersion ? qtVersion->qmakeFilePath() : FilePath(); FilePath qmake = qtVersion ? qtVersion->qmakeFilePath() : FilePath();
if (qmake.isEmpty()) if (qmake.isEmpty())
qmake = FilePath::fromString(Tr::tr("<no Qt version>")); qmake = FilePath::fromPathPart(Tr::tr("<no Qt version>"));
FilePath make = makeCommand(); FilePath make = makeCommand();
if (make.isEmpty()) if (make.isEmpty())
make = FilePath::fromString(Tr::tr("<no Make step found>")); make = FilePath::fromPathPart(Tr::tr("<no Make step found>"));
QString result = qmake.toString(); QString result = qmake.toString();
if (qtVersion) { if (qtVersion) {