Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
c9826c1b
Commit
c9826c1b
authored
Feb 17, 2011
by
hjk
Browse files
debugger: merge a few #ifdef Q_OS_WIN's
parent
0639d60f
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/abstractgdbadapter.cpp
View file @
c9826c1b
...
...
@@ -37,9 +37,7 @@
#include
"abstractgdbprocess.h"
#include
<utils/qtcassert.h>
#ifdef Q_OS_WIN
#include
<utils/qtcprocess.h>
#endif
#include
<QtCore/QProcess>
...
...
@@ -82,9 +80,9 @@ bool AbstractGdbAdapter::isTrkAdapter() const
return
false
;
}
#ifdef Q_OS_WIN
bool
AbstractGdbAdapter
::
prepareWinCommand
()
bool
AbstractGdbAdapter
::
prepareCommand
()
{
#ifdef Q_OS_WIN
Utils
::
QtcProcess
::
SplitError
perr
;
startParameters
().
processArgs
=
Utils
::
QtcProcess
::
prepareArgs
(
startParameters
().
processArgs
,
&
perr
,
...
...
@@ -96,9 +94,9 @@ bool AbstractGdbAdapter::prepareWinCommand()
"Debugging complex command lines is currently not supported under Windows"
),
QString
());
return
false
;
}
#endif
return
true
;
}
#endif
QString
AbstractGdbAdapter
::
msgGdbStopFailed
(
const
QString
&
why
)
{
...
...
src/plugins/debugger/gdb/abstractgdbadapter.h
View file @
c9826c1b
...
...
@@ -102,9 +102,7 @@ protected:
const
DebuggerStartParameters
&
startParameters
()
const
;
DebuggerStartParameters
&
startParameters
();
void
showMessage
(
const
QString
&
msg
,
int
channel
=
LogDebug
,
int
timeout
=
1
);
#ifdef Q_OS_WIN
bool
prepareWinCommand
();
#endif
bool
prepareCommand
();
GdbEngine
*
const
m_engine
;
};
...
...
src/plugins/debugger/gdb/localplaingdbadapter.cpp
View file @
c9826c1b
...
...
@@ -77,10 +77,8 @@ void LocalPlainGdbAdapter::startAdapter()
QTC_ASSERT
(
state
()
==
EngineSetupRequested
,
qDebug
()
<<
state
());
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
#ifdef Q_OS_WIN
if
(
!
prepareWinCommand
())
if
(
!
prepareCommand
())
return
;
#endif
QStringList
gdbArgs
;
...
...
src/plugins/debugger/gdb/termgdbadapter.cpp
View file @
c9826c1b
...
...
@@ -103,7 +103,7 @@ void TermGdbAdapter::startAdapter()
// m_stubProc.blockSignals(false);
#ifdef Q_OS_WIN
if
(
!
prepare
Win
Command
())
if
(
!
prepareCommand
())
return
;
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment