Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
903a50a6
Commit
903a50a6
authored
Sep 10, 2009
by
hjk
Browse files
debugger: work on trk integration
parent
75a3112a
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggermanager.cpp
View file @
903a50a6
...
...
@@ -1355,14 +1355,18 @@ void DebuggerManager::modulesDockToggled(bool on)
void
DebuggerManager
::
showDebuggerOutput
(
int
channel
,
const
QString
&
msg
)
{
QTC_ASSERT
(
m_outputWindow
,
return
);
m_outputWindow
->
showOutput
(
channel
,
msg
);
if
(
m_outputWindow
)
m_outputWindow
->
showOutput
(
channel
,
msg
);
else
qDebug
()
<<
"OUTPUT: "
<<
channel
<<
msg
;
}
void
DebuggerManager
::
showDebuggerInput
(
int
channel
,
const
QString
&
msg
)
{
QTC_ASSERT
(
m_outputWindow
,
return
);
m_outputWindow
->
showInput
(
channel
,
msg
);
if
(
m_outputWindow
)
m_outputWindow
->
showInput
(
channel
,
msg
);
else
qDebug
()
<<
"INPUT: "
<<
channel
<<
msg
;
}
...
...
src/plugins/debugger/symbian/symbianadapter.cpp
View file @
903a50a6
...
...
@@ -191,6 +191,7 @@ void SymbianAdapter::startInferior()
appendString
(
&
ba
,
file
,
TargetByteOrder
);
sendTrkMessage
(
0x40
,
TrkCB
(
handleCreateProcess
),
ba
);
// Create Item
//sendTrkMessage(TRK_WRITE_QUEUE_NOOP_CODE, TrkCB(startGdbServer));
emit
started
();
}
void
SymbianAdapter
::
logMessage
(
const
QString
&
msg
)
...
...
@@ -1292,7 +1293,8 @@ void SymbianAdapter::sendOutput(QObject *sender, const QString &data)
void
SymbianAdapter
::
handleProcError
(
QProcess
::
ProcessError
error
)
{
sendOutput
(
sender
(),
QString
(
"Process Error %1"
).
arg
(
error
));
sendOutput
(
sender
(),
QString
(
"Process Error %1: %2"
).
arg
(
error
).
arg
(
errorString
()));
}
void
SymbianAdapter
::
handleProcFinished
(
int
exitCode
,
QProcess
::
ExitStatus
exitStatus
)
...
...
@@ -1511,25 +1513,25 @@ void SymbianAdapter::handleRfcommReadyReadStandardOutput()
void
SymbianAdapter
::
start
(
const
QString
&
program
,
const
QStringList
&
args
,
QIODevice
::
OpenMode
mode
)
{
qDebug
()
<<
"SYMBIAN START"
;
Q_UNUSED
(
mode
);
qDebug
()
<<
"SYMBIAN START"
<<
program
<<
args
<<
mode
;
run
();
//m_gdbProc.start(program, args, mode);
}
void
SymbianAdapter
::
kill
()
{
//
m_gdbProc.kill();
m_gdbProc
.
kill
();
}
void
SymbianAdapter
::
terminate
()
{
//
m_gdbProc.terminate();
m_gdbProc
.
terminate
();
}
bool
SymbianAdapter
::
waitForFinished
(
int
msecs
)
{
//
return m_gdbProc.waitForFinished(msecs);
return
true
;
return
m_gdbProc
.
waitForFinished
(
msecs
);
//
return true;
}
QProcess
::
ProcessState
SymbianAdapter
::
state
()
const
...
...
src/plugins/debugger/symbian/symbianadapter.h
View file @
903a50a6
...
...
@@ -96,6 +96,7 @@ public slots:
signals:
void
output
(
const
QString
&
msg
);
void
startSuccessful
();
private
slots
:
void
handleProcError
(
QProcess
::
ProcessError
error
);
...
...
src/plugins/debugger/symbian/symbianengine.cpp
View file @
903a50a6
...
...
@@ -52,9 +52,10 @@ IDebuggerEngine *createSymbianEngine(DebuggerManager *parent,
Q_UNUSED
(
opts
);
//opts->push_back(new GdbOptionsPage);
SymbianAdapter
*
adapter
=
new
SymbianAdapter
;
GdbEngine
*
engine
=
new
GdbEngine
(
parent
,
adapter
);
QObject
::
connect
(
adapter
,
SIGNAL
(
output
(
QString
)),
parent
,
SLOT
(
showDebuggerOutput
(
QString
)));
return
new
GdbEngine
(
parent
,
adapter
)
;
return
engine
;
}
}
// namespace Internal
...
...
tests/manual/trk/trklauncher.pri
View file @
903a50a6
DEFINES += DEBUG_TRK=0
DEBUGGERHOME = ../../../src/plugins/debugger/symbian
INCLUDEPATH *= $$DEBUGGERHOME
INCLUDEPATH *=
$$PWD
$$DEBUGGERHOME
SOURCES += \
$$DEBUGGERHOME/trkutils.cpp \
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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