diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp index 9bc178ca9469b3965cca24ce2f026b4d6f110f16..5222fb8c1ae5ed2df59d644d80800d1e2e0b2d6c 100644 --- a/src/plugins/debugger/debuggermanager.cpp +++ b/src/plugins/debugger/debuggermanager.cpp @@ -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; } diff --git a/src/plugins/debugger/symbian/symbianadapter.cpp b/src/plugins/debugger/symbian/symbianadapter.cpp index 9ade25364d7e2cb121a98bb932a4c09455e04cb6..b13447499f76af826649905f82c6267c08138739 100644 --- a/src/plugins/debugger/symbian/symbianadapter.cpp +++ b/src/plugins/debugger/symbian/symbianadapter.cpp @@ -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 diff --git a/src/plugins/debugger/symbian/symbianadapter.h b/src/plugins/debugger/symbian/symbianadapter.h index 79c7860d5c4b08c2aa95a9a18a3456fe5b4efad6..da6c0735ab339cf623c59db71e9c0c34c1b04928 100644 --- a/src/plugins/debugger/symbian/symbianadapter.h +++ b/src/plugins/debugger/symbian/symbianadapter.h @@ -96,6 +96,7 @@ public slots: signals: void output(const QString &msg); + void startSuccessful(); private slots: void handleProcError(QProcess::ProcessError error); diff --git a/src/plugins/debugger/symbian/symbianengine.cpp b/src/plugins/debugger/symbian/symbianengine.cpp index ef407e2c53fbe90d020afcb36ef5ff0ff72880f1..cb30e78fd9da54250a717fec48dd1687343383f2 100644 --- a/src/plugins/debugger/symbian/symbianengine.cpp +++ b/src/plugins/debugger/symbian/symbianengine.cpp @@ -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 diff --git a/tests/manual/trk/trklauncher.pri b/tests/manual/trk/trklauncher.pri index 74b37e42e3cb5179d6b2b90fe7d6f6f8cb092b56..69ed763041061e00659fcc78be1c621cf4701f65 100644 --- a/tests/manual/trk/trklauncher.pri +++ b/tests/manual/trk/trklauncher.pri @@ -1,7 +1,7 @@ DEFINES += DEBUG_TRK=0 DEBUGGERHOME = ../../../src/plugins/debugger/symbian -INCLUDEPATH *= $$DEBUGGERHOME +INCLUDEPATH *= $$PWD $$DEBUGGERHOME SOURCES += \ $$DEBUGGERHOME/trkutils.cpp \