summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/builddirparameters.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2021-07-14 15:41:06 +0200
committerhjk <hjk@qt.io>2021-07-21 06:17:39 +0000
commita05414adf665a25b73256c90adc6fd9a72e7146b (patch)
tree3033cdcabd159109789bdfd1ca8ee677413c709b /src/plugins/cmakeprojectmanager/builddirparameters.cpp
parenta7756a72fd3c5ec86d2c42402636b26466333e23 (diff)
downloadqt-creator-a05414adf665a25b73256c90adc6fd9a72e7146b.tar.gz
CMake: Fix remote search of non-standard ninja installations
Change-Id: I9ec636b126b621bb7a676e55a31845328c9e5ba1 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/builddirparameters.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/builddirparameters.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
index dc71a5eb62..97ab54166c 100644
--- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp
+++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
@@ -86,9 +86,9 @@ BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc)
CMakeSpecificSettings *settings = CMakeProjectPlugin::projectTypeSpecificSettings();
if (!settings->ninjaPath.filePath().isEmpty()) {
- const Utils::FilePath setting = settings->ninjaPath.filePath();
- const Utils::FilePath path = setting.toFileInfo().isFile() ? setting.parentDir() : setting;
- environment.appendOrSetPath(path.toString());
+ const Utils::FilePath ninja = settings->ninjaPath.filePath();
+ const Utils::FilePath ninjaDir = ninja.isFile() ? ninja.parentDir() : ninja;
+ environment.appendOrSetPath(ninjaDir.path());
}
cmakeToolId = CMakeKitAspect::cmakeToolId(k);