diff options
| author | hjk <hjk@theqtcompany.com> | 2016-05-30 13:50:20 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2016-05-30 14:07:17 +0000 |
| commit | 3a6ee2c305db90a7a713e830b89187270b3175ec (patch) | |
| tree | d1374cf74ee026a26beb1b814beb00e1b2bdd219 | |
| parent | 299d93e77be421f1fa6fbb3f06701113013b4e11 (diff) | |
| download | qt-creator-3a6ee2c305db90a7a713e830b89187270b3175ec.tar.gz | |
Debugger: Move console stub procedure creation
... to a place where it can potentially be re-started.
Change-Id: Icc7ba4512533cdef659507442eec069e073f84b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/debugger/lldb/lldbengine.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 283b2c87d8..38d89a5792 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -87,19 +87,6 @@ LldbEngine::LldbEngine(const DebuggerRunParameters &startParameters) m_lastAgentId = 0; setObjectName(QLatin1String("LldbEngine")); - if (startParameters.useTerminal) { - #ifdef Q_OS_WIN - // Windows up to xp needs a workaround for attaching to freshly started processes. see proc_stub_win - if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) - m_stubProc.setMode(ConsoleProcess::Suspend); - else - m_stubProc.setMode(ConsoleProcess::Debug); - #else - m_stubProc.setMode(ConsoleProcess::Debug); - m_stubProc.setSettings(ICore::settings()); - #endif - } - connect(action(AutoDerefPointers), &SavedAction::valueChanged, this, &LldbEngine::updateLocals); connect(action(CreateFullBacktrace), &QAction::triggered, @@ -193,6 +180,17 @@ bool LldbEngine::prepareCommand() void LldbEngine::setupEngine() { if (runParameters().useTerminal) { + #ifdef Q_OS_WIN + // Windows up to xp needs a workaround for attaching to freshly started processes. see proc_stub_win + if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) + m_stubProc.setMode(ConsoleProcess::Suspend); + else + m_stubProc.setMode(ConsoleProcess::Debug); + #else + m_stubProc.setMode(ConsoleProcess::Debug); + m_stubProc.setSettings(ICore::settings()); + #endif + QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); showMessage(_("TRYING TO START ADAPTER")); |