TaskTree: Introduce timeoutTask helper

By default it finishes with error.

Change-Id: Idff895f02736818762127e248f6ee8217cc2c809
Reviewed-by: hjk <hjk@qt.io>

src/libs/solutions/tasking/tasktree.cpp

@@ -3635,6 +3635,11 @@ void TimeoutTaskAdapter::start()
     });
 }
 
+ExecutableItem timeoutTask(const std::chrono::milliseconds &timeout, DoneResult result)
+{
+    return TimeoutTask([timeout](std::chrono::milliseconds &t) { t = timeout; }, result);
+}
+
 /*!
     \typealias Tasking::TaskTreeTask
 

src/libs/solutions/tasking/tasktree.h

@@ -707,6 +707,9 @@ private:
 using TaskTreeTask = CustomTask<TaskTreeTaskAdapter>;
 using TimeoutTask = CustomTask<TimeoutTaskAdapter>;
 
+TASKING_EXPORT ExecutableItem timeoutTask(const std::chrono::milliseconds &timeout,
+                                          DoneResult result = DoneResult::Error);
+
 } // namespace Tasking
 
 QT_END_NAMESPACE

src/plugins/android/androidrunnerworker.cpp

@@ -5,7 +5,6 @@
 
 #include "androidconfigurations.h"
 #include "androidconstants.h"
-#include "androiddeviceinfo.h"
 #include "androidtr.h"
 #include "androidutils.h"
 
@@ -874,8 +873,7 @@ static ExecutableItem pidRecipe(const Storage<RunnerStorage> &storage)
         Forever {
             stopOnSuccess,
             ProcessTask(onPidSetup, onPidDone, CallDoneIf::Success),
-            TimeoutTask([](std::chrono::milliseconds &timeout) { timeout = 200ms; },
+            timeoutTask(200ms)
-                        DoneResult::Error)
         }.withTimeout(45s),
         ProcessTask(onUserSetup, onUserDone, CallDoneIf::Success),
         ProcessTask(onArtSetup, onArtDone),

src/plugins/android/androidutils.cpp

@@ -736,13 +736,13 @@ static ExecutableItem waitForAvdRecipe(const QString &avdName, const Storage<QSt
         Forever {
             stopOnSuccess,
             serialNumberRecipe(avdName, serialNumberStorage),
-            TimeoutTask([](std::chrono::milliseconds &timeout) { timeout = 100ms; }, DoneResult::Error)
+            timeoutTask(100ms)
         }.withTimeout(30s),
         Forever {
             stopStorage,
             stopOnSuccess,
             isAvdBootedRecipe(serialNumberStorage),
-            TimeoutTask([](std::chrono::milliseconds &timeout) { timeout = 100ms; }, DoneResult::Error),
+            timeoutTask(100ms),
             Group {
                 outputStorage,
                 AndroidConfig::devicesCommandOutputRecipe(outputStorage),