From 681f039d79e1ba76f5391c37bcd36b675eb21869 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 25 Jan 2024 16:41:38 +0100 Subject: [PATCH] AppMan: Fix dependencies of RunWorkers during QML Profiling Change-Id: Id8a43d31369ae4cf150458dcab4693bf967decec Reviewed-by: hjk --- src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp index 2bbb4e92897..ec1aa7244ed 100644 --- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp @@ -97,6 +97,7 @@ public: m_qmlServices(qmlServices) { setId(AppManager::Constants::DEBUG_LAUNCHER_ID); + setEssential(true); connect(&m_launcher, &Process::started, this, &RunWorker::reportStarted); connect(&m_launcher, &Process::done, this, &RunWorker::reportStopped); @@ -202,8 +203,6 @@ public: { setId("ApplicationManagerPlugin.Debug.Support"); - //setUsePortsGatherer(isCppDebugging(), isQmlDebugging()); - m_debuggee = new AppManInferiorRunner(runControl, false, isCppDebugging(), isQmlDebugging(), QmlDebug::QmlDebuggerServices); @@ -285,6 +284,9 @@ public: m_worker = runControl->createWorker(QmlDebug::runnerIdForRunMode(runControl->runMode())); m_worker->addStartDependency(this); addStopDependency(m_worker); + + // Make sure the QML Profiler is stopped before the appman-controller + m_runner->addStopDependency(m_worker); } private: