From 586fe9659409577858ba2d0d4b903f273f3b51d6 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 25 Oct 2024 14:57:38 +0200 Subject: [PATCH] Android: Fix running qml application when debugging is enabled Execute onQmlDebugSync only in case isQmlDebug. Before it was mistakenly executed always. This doesn't fix debugging on Android, but fixes running qml app when debugging is enabled. Amends 5e46ff6cc31d0a139d3edef6432f205a3cf02255 Task-number: QTCREATORBUG-31885 Change-Id: I8f2dcefac671e87bbb6e9db5fa8c985d9830a9b1 Reviewed-by: Assam Boudjelthia --- src/plugins/android/androidrunnerworker.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 549458323cc..c5e7ece5872 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -508,15 +508,14 @@ static ExecutableItem preStartRecipe(const Storage &storage) storage->m_glue->addStdErr(process.cleanedStdErr().trimmed()); }; - const auto onQmlDebugSetup = [storage] { - return storage->m_qmlDebugServices == QmlDebug::NoQmlDebugServices - ? SetupResult::StopWithSuccess : SetupResult::Continue; + const auto isQmlDebug = [storage] { + return storage->m_qmlDebugServices != QmlDebug::NoQmlDebugServices; }; const auto onTaskTreeSetup = [storage](TaskTree &taskTree) { const QString port = "tcp:" + QString::number(storage->m_qmlServer.port()); taskTree.setRecipe({removeForwardPortRecipe(storage.activeStorage(), port, port, "QML")}); }; - const auto onQmlDebugDone = [storage, argsStorage] { + const auto onQmlDebugSync = [storage, argsStorage] { const QString qmljsdebugger = QString("port:%1,block,services:%2") .arg(storage->m_qmlServer.port()).arg(QmlDebug::qmlDebugServices(storage->m_qmlDebugServices)); @@ -560,10 +559,9 @@ static ExecutableItem preStartRecipe(const Storage &storage) For (iterator) >> Do { ProcessTask(onPreCommandSetup, onPreCommandDone, CallDoneIf::Error) }, - Group { - onGroupSetup(onQmlDebugSetup), + If (isQmlDebug) >> Then { TaskTreeTask(onTaskTreeSetup), - onGroupDone(onQmlDebugDone, CallDoneIf::Success) + Sync(onQmlDebugSync) }, ProcessTask(onActivitySetup, onActivityDone, CallDoneIf::Error) };