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
0e2a7608
Commit
0e2a7608
authored
Sep 06, 2010
by
hjk
Browse files
debugger: fix remote adapter startup
parent
053f36c4
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggerengine.cpp
View file @
0e2a7608
...
...
@@ -111,6 +111,7 @@ DebuggerStartParameters::DebuggerStartParameters()
breakAtMain
(
false
),
qmlServerAddress
(
"127.0.0.1"
),
qmlServerPort
(
0
),
useServerStartScript
(
false
),
toolChainType
(
ToolChain
::
UNKNOWN
),
startMode
(
NoStartMode
),
executableUid
(
0
)
...
...
@@ -144,6 +145,7 @@ QDebug operator<<(QDebug str, const DebuggerStartParameters &sp)
<<
" remoteChannel="
<<
sp
.
remoteChannel
<<
" remoteArchitecture="
<<
sp
.
remoteArchitecture
<<
" symbolFileName="
<<
sp
.
symbolFileName
<<
" useServerStartScript="
<<
sp
.
useServerStartScript
<<
" serverStartScript="
<<
sp
.
serverStartScript
<<
" toolchain="
<<
sp
.
toolChainType
<<
'\n'
;
return
str
;
...
...
src/plugins/debugger/debuggerengine.h
View file @
0e2a7608
...
...
@@ -85,6 +85,7 @@ public:
QString
remoteChannel
;
QString
remoteArchitecture
;
QString
symbolFileName
;
bool
useServerStartScript
;
QString
serverStartScript
;
QString
sysRoot
;
QByteArray
remoteDumperLib
;
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
0e2a7608
...
...
@@ -1764,7 +1764,7 @@ void DebuggerPluginPrivate::attachExternalApplication
sp
.
displayName
=
tr
(
"Process %1"
).
arg
(
pid
);
sp
.
executable
=
binary
;
sp
.
crashParameter
=
crashParameter
;
sp
.
startMode
=
crashParameter
.
isEmpty
()
?
AttachExternal
:
AttachCrashedExternal
;
sp
.
startMode
=
crashParameter
.
isEmpty
()
?
AttachExternal
:
AttachCrashedExternal
;
DebuggerRunControl
*
rc
=
createDebugger
(
sp
);
startDebugger
(
rc
);
}
...
...
@@ -1844,8 +1844,8 @@ void DebuggerPluginPrivate::startRemoteApplication()
if
(
!
sp
.
debuggerCommand
.
isEmpty
())
sp
.
toolChainType
=
ToolChain
::
INVALID
;
sp
.
startMode
=
AttachToRemote
;
if
(
dlg
.
useServerStartScript
()
)
sp
.
serverStartScript
=
dlg
.
serverStartScript
();
sp
.
useServerStartScript
=
dlg
.
useServerStartScript
()
;
sp
.
serverStartScript
=
dlg
.
serverStartScript
();
sp
.
sysRoot
=
dlg
.
sysRoot
();
startDebugger
(
createDebugger
(
sp
));
}
...
...
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View file @
0e2a7608
...
...
@@ -88,6 +88,10 @@ void RemoteGdbServerAdapter::startAdapter()
{
QTC_ASSERT
(
state
()
==
EngineSetupRequested
,
qDebug
()
<<
state
());
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
if
(
!
startParameters
().
useServerStartScript
)
{
handleSetupDone
();
return
;
}
if
(
startParameters
().
serverStartScript
.
isEmpty
())
{
showMessage
(
_
(
"No server start script given. "
),
StatusBar
);
emit
requestSetup
();
...
...
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