diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp index 33f32b36b85..311e41fa53b 100644 --- a/src/plugins/debugger/gdb/termgdbadapter.cpp +++ b/src/plugins/debugger/gdb/termgdbadapter.cpp @@ -49,16 +49,16 @@ namespace Internal { GdbTermEngine::GdbTermEngine(const DebuggerRunParameters &startParameters) : GdbEngine(startParameters) { -#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 + if (HostOsInfo::isWindowsHost()) { + // 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); -#else - m_stubProc.setMode(ConsoleProcess::Debug); - m_stubProc.setSettings(Core::ICore::settings()); -#endif + m_stubProc.setSettings(Core::ICore::settings()); + } } GdbTermEngine::~GdbTermEngine() diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 4d527f0e5ca..20c0077ad71 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -193,16 +193,16 @@ void LldbEngine::setupEngine() if (runParameters().useTerminal) { QTC_CHECK(false); // See above. - #ifdef Q_OS_WIN + if (HostOsInfo::isWindowsHost()) { // 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 + } else { m_stubProc.setMode(ConsoleProcess::Debug); m_stubProc.setSettings(ICore::settings()); - #endif + } QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); showMessage("TRYING TO START ADAPTER");