feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Avoid more platform ifdefs

Browse Source 
Change-Id: I184a2dc4c20ffa17e258d049a6183f0ef1fbd8b6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Eike Ziller
2014-04-08 09:26:41 +02:00
parent b687658663
commit c523ad46fa
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View File

@@ -62,9 +62,8 @@ GdbRemoteServerEngine::GdbRemoteServerEngine(const DebuggerStartParameters &star
{ {
m_isMulti = false; m_isMulti = false;
m_targetPid = -1; m_targetPid = -1;
#ifdef Q_OS_WIN if (Utils::HostOsInfo::isWindowsHost())
m_gdbProc->setUseCtrlCStub(startParameters.useCtrlCStub); // This is only set for QNX/BlackBerry m_gdbProc->setUseCtrlCStub(startParameters.useCtrlCStub); // This is only set for QNX/BlackBerry
#endif
connect(&m_uploadProc, SIGNAL(error(QProcess::ProcessError)), connect(&m_uploadProc, SIGNAL(error(QProcess::ProcessError)),
SLOT(uploadProcError(QProcess::ProcessError))); SLOT(uploadProcError(QProcess::ProcessError)));
connect(&m_uploadProc, SIGNAL(readyReadStandardOutput()), connect(&m_uploadProc, SIGNAL(readyReadStandardOutput()),

3
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -197,9 +197,8 @@ void AbstractProcessStep::run(QFutureInterface<bool> &fi)
} }
m_process = new Utils::QtcProcess(); m_process = new Utils::QtcProcess();
#ifdef Q_OS_WIN if (Utils::HostOsInfo::isWindowsHost())
m_process->setUseCtrlCStub(true); m_process->setUseCtrlCStub(true);
#endif
m_process->setWorkingDirectory(wd.absolutePath()); m_process->setWorkingDirectory(wd.absolutePath());
m_process->setEnvironment(m_param.environment()); m_process->setEnvironment(m_param.environment());