summaryrefslogtreecommitdiff
path: root/src/libs/utils/pathchooser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/utils/pathchooser.cpp')
-rw-r--r--src/libs/utils/pathchooser.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 9246366b68..3ee3233936 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -129,16 +129,12 @@ QString BinaryVersionToolTipEventFilter::toolVersion(const QString &binary, cons
{
if (binary.isEmpty())
return QString();
- QProcess proc;
- proc.start(binary, arguments);
- if (!proc.waitForStarted())
+ SynchronousProcess proc;
+ proc.setTimeoutS(1);
+ SynchronousProcessResponse response = proc.run(binary, arguments);
+ if (response.result != SynchronousProcessResponse::Finished)
return QString();
- if (!proc.waitForFinished()) {
- SynchronousProcess::stopProcess(proc);
- return QString();
- }
- return QString::fromLocal8Bit(QByteArray(proc.readAllStandardOutput()
- + proc.readAllStandardError()));
+ return response.allOutput();
}
// Extends BinaryVersionToolTipEventFilter to prepend the existing pathchooser