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

Qnx: Avoid some use of SynchronousProcess

Browse Source 
Change-Id: I4ae66efc9e09196e0ce0c08c939f1d7f1386f071
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-04-30 07:45:59 +02:00
parent a2dadb3d0b
commit ada1e68e35
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qnx/qnxutils.cpp
View File

@@ -29,14 +29,13 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/synchronousprocess.h> #include <utils/qtcprocess.h>
#include <utils/temporaryfile.h> #include <utils/temporaryfile.h>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QDirIterator> #include <QDirIterator>
#include <QDomDocument> #include <QDomDocument>
#include <QProcess>
#include <QStandardPaths> #include <QStandardPaths>
#include <QApplication> #include <QApplication>
@@ -108,20 +107,19 @@ EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const QString &fileName)
tmpFile.close(); tmpFile.close();
// running wrapper script // running wrapper script
QProcess process; QtcProcess process;
if (isWindows) if (isWindows)
process.start(QLatin1String("cmd.exe"), process.setCommand({"cmd.exe", {"/C", tmpFile.fileName()}});
QStringList() << QLatin1String("/C") << tmpFile.fileName());
else else
process.start(QLatin1String("/bin/bash"), process.setCommand({"/bin/bash", {tmpFile.fileName()}});
QStringList() << tmpFile.fileName()); process.start();
// waiting for finish // waiting for finish
QApplication::setOverrideCursor(Qt::BusyCursor); QApplication::setOverrideCursor(Qt::BusyCursor);
bool waitResult = process.waitForFinished(10000); bool waitResult = process.waitForFinished(10000);
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
if (!waitResult) { if (!waitResult) {
Utils::SynchronousProcess::stopProcess(process); process.stopProcess();
return items; return items;
} }