From 33ea6f24333805381db63c4074315748bc3cf58e Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 16 Nov 2022 09:27:18 +0100 Subject: [PATCH] Utils: Don't resolve relative paths in ProcessArgs::prepareCommand Part of an attempt to disentangle streamline environment creation/setup. Searching is expensive and needs currently the proper environment. Change-Id: I95d93abf6c0cedeb8ba0b7a447345cd033ac2f25 Reviewed-by: Christian Kandeler --- src/libs/utils/commandline.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libs/utils/commandline.cpp b/src/libs/utils/commandline.cpp index 77e33fc83bc..41aa9b29bd9 100644 --- a/src/libs/utils/commandline.cpp +++ b/src/libs/utils/commandline.cpp @@ -632,12 +632,10 @@ void ProcessArgs::addArgs(QString *args, const QStringList &inArgs) bool ProcessArgs::prepareCommand(const CommandLine &cmdLine, QString *outCmd, ProcessArgs *outArgs, const Environment *env, const FilePath *pwd) { - FilePath executable = cmdLine.executable(); - const QString arguments = cmdLine.arguments(); - if (env && executable.isRelativePath()) - executable = env->searchInPath(executable.toString()); + const FilePath executable = cmdLine.executable(); if (executable.isEmpty()) return false; + const QString arguments = cmdLine.arguments(); ProcessArgs::SplitError err; *outArgs = ProcessArgs::prepareArgs(arguments, &err, executable.osType(), env, pwd); if (err == ProcessArgs::SplitOk) {