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

SilverSearcher: Fix finding the tool

Browse Source 
The documentation tells the user to adapt the PATH in the Preferences >
Environment > System. Setting that as the environment got lost in
9a0285ba0e

Fixes: QTCREATORBUG-32335
Change-Id: I3e06fe6a5195b5571e723c0e58cb81c592bf1082
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2025-01-16 09:45:53 +01:00
parent 97a37eb6fd
commit 574d598120
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/silversearcher/findinfilessilversearcher.cpp
View File

@@ -9,8 +9,9 @@
#include <texteditor/findinfiles.h> #include <texteditor/findinfiles.h>
#include <utils/async.h> #include <utils/async.h>
#include <utils/qtcprocess.h> #include <utils/environment.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/qtcsettings.h> #include <utils/qtcsettings.h>
#include <QHBoxLayout> #include <QHBoxLayout>
@@ -50,6 +51,7 @@ static bool isSilverSearcherAvailable()
{ {
Process silverSearcherProcess; Process silverSearcherProcess;
silverSearcherProcess.setCommand({"ag", {"--version"}}); silverSearcherProcess.setCommand({"ag", {"--version"}});
silverSearcherProcess.setEnvironment(Environment::systemEnvironment());
silverSearcherProcess.start(); silverSearcherProcess.start();
using namespace std::chrono_literals; using namespace std::chrono_literals;
return silverSearcherProcess.waitForFinished(1s) return silverSearcherProcess.waitForFinished(1s)
@@ -88,6 +90,7 @@ static void runSilverSeacher(QPromise<SearchResultItems> &promise,
arguments << "--" << parameters.text << parameters.searchDir.normalizedPathName().toString(); arguments << "--" << parameters.text << parameters.searchDir.normalizedPathName().toString();
process.setCommand({"ag", arguments}); process.setCommand({"ag", arguments});
process.setEnvironment(Environment::systemEnvironment());
}; };
FilePath lastFilePath; FilePath lastFilePath;