diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index c7732607426..daa5dd278f6 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -268,6 +268,9 @@ public: void setServerEssential(bool on) { m_serverEssential = on; } bool serverEssential() const { return m_serverEssential; } + void setSkipDebugServer(bool on) { m_skipDebugServer = on; } + bool skipDebugServer() const { return m_skipDebugServer; } + void setAddQmlServerInferiorCmdArgIfNeeded(bool on) { m_addQmlServerInferiorCmdArgIfNeeded = on; } bool isAddQmlServerInferiorCmdArgIfNeeded() const { return m_addQmlServerInferiorCmdArgIfNeeded; } @@ -367,6 +370,7 @@ private: Utils::ProcessHandle m_serverAttachPid; bool m_serverUseMulti = true; bool m_serverEssential = true; + bool m_skipDebugServer = false; bool m_addQmlServerInferiorCmdArgIfNeeded = false; }; diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index c5a931d5d54..5fb02fbfae5 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -562,7 +562,7 @@ void DebuggerRunTool::showMessage(const QString &msg, int channel, int timeout) void DebuggerRunTool::startDebugServerIfNeededAndContinueStartup() { - if (!runControl()->usesDebugChannel()) { + if (!runControl()->usesDebugChannel() || m_runParameters.skipDebugServer()) { continueAfterDebugServerStart(); return; } diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index 6a90fef38c8..f61fb097776 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -208,6 +208,7 @@ public: rp.setCloseMode(KillAtClose); rp.setUseCtrlCStub(true); rp.setSolibSearchPath(FileUtils::toFilePathList(searchPaths(k))); + rp.setSkipDebugServer(true); if (auto qtVersion = dynamic_cast(QtSupport::QtKitAspect::qtVersion(k))) { rp.setSysRoot(qtVersion->qnxTarget()); rp.modifyDebuggerEnvironment(qtVersion->environment());