From e828ef1c13f00afe08f39ca64f3b2363a3b8e958 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 24 Jan 2024 23:49:40 +0100
Subject: [PATCH] GenericLinuxDeviceTester: Simplify the main recipe

It's now easily possible to mix GroupItems with the lists of
GroupItems on a common list.

Change-Id: I32b4061e45302e8532d39f84c4e6eb8c9e719faf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/remotelinux/linuxdevicetester.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index e57223e9824..49628ccfd74 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -307,17 +307,16 @@ void GenericLinuxDeviceTester::testDevice(const IDevice::Ptr &deviceConfiguratio
 
     d->m_device = deviceConfiguration;
 
-    QList<GroupItem> taskItems = {
+    const Group root {
         d->echoTask("Hello"), // No quoting necessary
         d->echoTask("Hello Remote World!"), // Checks quoting, too.
         d->unameTask(),
         d->gathererTask(),
-        d->transferTasks()
+        d->transferTasks(),
+        d->m_extraTests,
+        d->commandTasks()
     };
-    if (!d->m_extraTests.isEmpty())
-        taskItems << Group { d->m_extraTests };
-    taskItems << d->commandTasks();
-    d->m_taskTreeRunner.start(taskItems);
+    d->m_taskTreeRunner.start(root);
 }
 
 void GenericLinuxDeviceTester::stopTest()