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

Use Utils::FilePath in SynchronousProcess

Browse Source 
Adapt callers and surrounding code.

Change-Id: Ie6c1883a44169cf9d790d06b660f46d24dc24c89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-06-06 16:27:55 +02:00
parent 021d3a6c59
commit ca4ba34229
48 changed files with 202 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/highlightersettings.cpp
View File

@@ -28,6 +28,8 @@
#include "texteditorconstants.h"
#include <coreplugin/icore.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
#include <utils/synchronousprocess.h>
@@ -67,12 +69,12 @@ QString findFallbackDefinitionsLocation()
}
// Try kde-config.
const QStringList programs = {QLatin1String("kde-config"), QLatin1String("kde4-config")};
const QStringList programs = {"kde-config", "kde4-config"};
for (auto &program : programs) {
Utils::SynchronousProcess process;
process.setTimeoutS(5);
Utils::SynchronousProcessResponse response
= process.runBlocking(program, QStringList(QLatin1String("--prefix")));
= process.runBlocking({Utils::FilePath::fromString(program), {"--prefix"}});
if (response.result == Utils::SynchronousProcessResponse::Finished) {
QString output = response.stdOut();
output.remove(QLatin1Char('\n'));