From 301e18f12be3867db44e1706fa6ee8da418d7d2f Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 13 Jul 2023 13:30:34 +0200
Subject: [PATCH] LogTailFiles: Replace QProcess with Process

Change-Id: Ia154daf16a801d8d09ac1a1a5e00c669ad9f36ad
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/ios/iostoolhandler.cpp | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index 34dd74de2ec..3d6fe1cfde1 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -65,27 +65,20 @@ public:
         watcher.setFuture(promise.future());
 
         // Process to print the console output while app is running.
-        auto logProcess = [&](QProcess *tailProcess, std::shared_ptr<QTemporaryFile> file) {
-            QObject::connect(tailProcess, &QProcess::readyReadStandardOutput, &loop, [&, tailProcess] {
+        auto logProcess = [&](Process *tailProcess, std::shared_ptr<QTemporaryFile> file) {
+            QObject::connect(tailProcess, &Process::readyReadStandardOutput, &loop, [&, tailProcess] {
                 if (!promise.isCanceled())
-                    emit logMessage(QString::fromLocal8Bit(tailProcess->readAll()));
+                    emit logMessage(QString::fromLocal8Bit(tailProcess->readAllRawStandardOutput()));
             });
-            tailProcess->start(QStringLiteral("tail"), {"-f", file->fileName()});
+            tailProcess->setCommand({FilePath::fromString("tail"), {"-f", file->fileName()}});
+            tailProcess->start();
         };
 
-        auto processDeleter = [](QProcess *process) {
-            if (process->state() != QProcess::NotRunning) {
-                process->terminate();
-                process->waitForFinished();
-            }
-            delete process;
-        };
-
-        std::unique_ptr<QProcess, void(*)(QProcess *)> tailStdout(new QProcess, processDeleter);
+        std::unique_ptr<Process> tailStdout(new Process);
         if (stdoutFile)
             logProcess(tailStdout.get(), stdoutFile);
 
-        std::unique_ptr<QProcess, void(*)(QProcess *)> tailStderr(new QProcess, processDeleter);
+        std::unique_ptr<Process> tailStderr(new Process);
         if (stderrFile)
             logProcess(tailStderr.get(), stderrFile);