From 17579bf93e7563032735d486ca8f853b93de97ab Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 10 Jan 2025 13:32:31 +0100 Subject: [PATCH] Debugger: Transform DebuggerRunParameters::useTargetAsync Task-number: QTCREATORBUG-29168 Change-Id: I969fddf1efa43790506da56f87c648fcc9e7b4f4 Reviewed-by: hjk --- src/plugins/android/androiddebugsupport.cpp | 2 +- src/plugins/debugger/debuggerengine.h | 6 +++++- src/plugins/debugger/debuggerruncontrol.cpp | 5 ----- src/plugins/debugger/debuggerruncontrol.h | 2 -- src/plugins/debugger/gdb/gdbengine.cpp | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 8cb93a0cd16..61b74e891f1 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -102,7 +102,7 @@ public: if (!HostOsInfo::isWindowsHost() && (qtVersion && AndroidConfig::ndkVersion(qtVersion) >= QVersionNumber(11, 0, 0))) { qCDebug(androidDebugSupportLog) << "UseTargetAsync: " << true; - setUseTargetAsync(true); + rp.setUseTargetAsync(true); } if (isCppDebugging()) { diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index adcfaa0bc2b..4a3b14500a3 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -144,7 +144,9 @@ public: void setUseCtrlCStub(bool on) { m_useCtrlCStub = on; } bool useCtrlCStub() const { return m_useCtrlCStub; } - bool useTargetAsync = false; + void setUseTargetAsync(bool on) { m_useTargetAsync = on; } + bool useTargetAsync() const { return m_useTargetAsync; } + Utils::FilePaths additionalSearchDirectories; // Used by iOS. @@ -246,6 +248,8 @@ private: QStringList m_expectedSignals; // Used by Valgrind bool m_useCtrlCStub = false; // For QNX debugging. + + bool m_useTargetAsync = false; }; namespace Internal { diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 971482c60a6..3bdd652f1be 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -113,11 +113,6 @@ void DebuggerRunTool::setLldbPlatform(const QString &platform) m_runParameters.platform = platform; } -void DebuggerRunTool::setUseTargetAsync(bool on) -{ - m_runParameters.useTargetAsync = on; -} - void DebuggerRunTool::setContinueAfterAttach(bool on) { m_runParameters.continueAfterAttach = on; diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h index 9a959c1dfa7..cbdcc90ebbd 100644 --- a/src/plugins/debugger/debuggerruncontrol.h +++ b/src/plugins/debugger/debuggerruncontrol.h @@ -64,8 +64,6 @@ public: void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item); void addSearchDirectory(const Utils::FilePath &dir); - void setUseTargetAsync(bool on); - void setIosPlatform(const QString &platform); void setDeviceSymbolsRoot(const QString &deviceSymbolsRoot); void setDeviceUuid(const QString &uuid); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index b3bc7bb44da..f6cf4d0b2d3 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4303,7 +4303,7 @@ bool GdbEngine::usesExecInterrupt() const bool GdbEngine::usesTargetAsync() const { - return runParameters().useTargetAsync || settings().targetAsync(); + return runParameters().useTargetAsync() || settings().targetAsync(); } void GdbEngine::scheduleTestResponse(int testCase, const QString &response)