From 8679138f73acf201636e957ba772a4a673778c96 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 29 Nov 2022 18:34:46 +0100 Subject: [PATCH] QMake: Fix building of remote projects Task-number: QTCREATORBUG-28355 Change-Id: I7e4a5b1b74fe7c95f8c56eb512a1714d2afb0a70 Reviewed-by: Christian Stenger --- src/plugins/qmakeprojectmanager/qmakestep.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 402ea50f461..3fe79dfa199 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -115,11 +115,11 @@ QString QMakeStep::allArguments(const QtVersion *v, ArgumentFlags flags) const QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); QStringList arguments; if (bc->subNodeBuild()) - arguments << bc->subNodeBuild()->filePath().toUserOutput(); + arguments << bc->subNodeBuild()->filePath().nativePath(); else if (flags & ArgumentFlag::OmitProjectPath) arguments << project()->projectFilePath().fileName(); else - arguments << project()->projectFilePath().toUserOutput(); + arguments << project()->projectFilePath().nativePath(); if (v->qtVersion() < QVersionNumber(5, 0, 0)) arguments << "-r"; @@ -415,10 +415,10 @@ QString QMakeStep::effectiveQMakeCall() const QtVersion *qtVersion = QtKitAspect::qtVersion(kit()); FilePath qmake = qtVersion ? qtVersion->qmakeFilePath() : FilePath(); if (qmake.isEmpty()) - qmake = FilePath::fromString(Tr::tr("")); + qmake = FilePath::fromPathPart(Tr::tr("")); FilePath make = makeCommand(); if (make.isEmpty()) - make = FilePath::fromString(Tr::tr("")); + make = FilePath::fromPathPart(Tr::tr("")); QString result = qmake.toString(); if (qtVersion) {