diff options
| author | hjk <hjk@qt.io> | 2022-11-29 18:34:46 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-11-30 11:41:52 +0000 |
| commit | 8679138f73acf201636e957ba772a4a673778c96 (patch) | |
| tree | 4e714e64077422ede47729c6b2debaf02b1422c3 | |
| parent | 5e50b9d604ae8855c50f06a19bd1444509163a9f (diff) | |
QMake: Fix building of remote projects
Task-number: QTCREATORBUG-28355
Change-Id: I7e4a5b1b74fe7c95f8c56eb512a1714d2afb0a70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakestep.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 402ea50f46..3fe79dfa19 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("<no Qt version>")); + qmake = FilePath::fromPathPart(Tr::tr("<no Qt version>")); FilePath make = makeCommand(); 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(); if (qtVersion) { |