From ada1e68e3549f9a5f1c8039092c8f461aac5d46d Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 30 Apr 2021 07:45:59 +0200 Subject: [PATCH] Qnx: Avoid some use of SynchronousProcess Change-Id: I4ae66efc9e09196e0ce0c08c939f1d7f1386f071 Reviewed-by: Christian Stenger --- src/plugins/qnx/qnxutils.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp index 6ff1b387725..5e5d762432f 100644 --- a/src/plugins/qnx/qnxutils.cpp +++ b/src/plugins/qnx/qnxutils.cpp @@ -29,14 +29,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include #include #include @@ -108,20 +107,19 @@ EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const QString &fileName) tmpFile.close(); // running wrapper script - QProcess process; + QtcProcess process; if (isWindows) - process.start(QLatin1String("cmd.exe"), - QStringList() << QLatin1String("/C") << tmpFile.fileName()); + process.setCommand({"cmd.exe", {"/C", tmpFile.fileName()}}); else - process.start(QLatin1String("/bin/bash"), - QStringList() << tmpFile.fileName()); + process.setCommand({"/bin/bash", {tmpFile.fileName()}}); + process.start(); // waiting for finish QApplication::setOverrideCursor(Qt::BusyCursor); bool waitResult = process.waitForFinished(10000); QApplication::restoreOverrideCursor(); if (!waitResult) { - Utils::SynchronousProcess::stopProcess(process); + process.stopProcess(); return items; }