From b0afd728d122cae6ed67d49760cd760cf981a122 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 2 May 2022 19:59:40 +0200
Subject: [PATCH] QnxDevice: Don't use SshDeviceProcess

Use QtcProcess with a path on qnx device instead.
Fix QtcProcess::runBlocking() for remotes.

Change-Id: Ic9364037835b247479f4b4329e40a314e09d5492
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
---
 src/plugins/qnx/qnxdevice.cpp | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp
index afd0170d1cf..4506e357271 100644
--- a/src/plugins/qnx/qnxdevice.cpp
+++ b/src/plugins/qnx/qnxdevice.cpp
@@ -33,20 +33,14 @@
 #include "qnxdeviceprocess.h"
 #include "qnxdevicewizard.h"
 
-#include <projectexplorer/devicesupport/sshdeviceprocess.h>
-#include <projectexplorer/runcontrol.h>
-
 #include <remotelinux/sshprocessinterface.h>
 
-#include <ssh/sshconnection.h>
 #include <utils/port.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
 
-#include <QApplication>
 #include <QRegularExpression>
-#include <QStringList>
-#include <QThread>
 
 using namespace ProjectExplorer;
 using namespace RemoteLinux;
@@ -153,18 +147,10 @@ int QnxDevice::qnxVersion() const
 
 void QnxDevice::updateVersionNumber() const
 {
-    QEventLoop eventLoop;
-    SshDeviceProcess versionNumberProcess(sharedFromThis());
-    QObject::connect(&versionNumberProcess, &QtcProcess::done, &eventLoop, &QEventLoop::quit);
+    QtcProcess versionNumberProcess;
 
-    versionNumberProcess.setCommand({"uname", {"-r"}});
-    versionNumberProcess.start();
-
-    bool isGuiThread = QThread::currentThread() == QCoreApplication::instance()->thread();
-    if (isGuiThread)
-        QApplication::setOverrideCursor(Qt::WaitCursor);
-
-    eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
+    versionNumberProcess.setCommand({mapToGlobalPath("uname"), {"-r"}});
+    versionNumberProcess.runBlocking(EventLoopMode::On);
 
     QByteArray output = versionNumberProcess.readAllStandardOutput();
     QString versionMessage = QString::fromLatin1(output);
@@ -176,9 +162,6 @@ void QnxDevice::updateVersionNumber() const
         int patch = match.captured(3).toInt();
         m_versionNumber = (major << 16)|(minor<<8)|(patch);
     }
-
-    if (isGuiThread)
-        QApplication::restoreOverrideCursor();
 }
 
 void QnxDevice::fromMap(const QVariantMap &map)