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

Debugger[CDB]: Wire stderr/stdout output.

Browse Source
This commit is contained in:
Friedemann Kleint
2010-04-20 10:31:40 +02:00
parent f0a64720c8
commit bb6a7c3c6c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/cdb/cdbdebugengine.cpp
View File

@@ -152,10 +152,10 @@ bool CdbDebugEnginePrivate::init(QString *errorMessage)
manager(), SLOT(showDebuggerOutput(int,QString))); manager(), SLOT(showDebuggerOutput(int,QString)));
connect(output, SIGNAL(debuggerInputPrompt(int,QString)), connect(output, SIGNAL(debuggerInputPrompt(int,QString)),
manager(), SLOT(showDebuggerInput(int,QString))); manager(), SLOT(showDebuggerInput(int,QString)));
connect(output, SIGNAL(debuggeeOutput(QString)), connect(output, SIGNAL(debuggeeOutput(QString,bool)),
manager(), SLOT(showApplicationOutput(QString))); manager(), SLOT(showApplicationOutput(QString,bool)));
connect(output, SIGNAL(debuggeeInputPrompt(QString)), connect(output, SIGNAL(debuggeeInputPrompt(QString,bool)),
manager(), SLOT(showApplicationOutput(QString))); manager(), SLOT(showApplicationOutput(QString,bool)));
setDebugEventCallback(DebugEventCallbackBasePtr(new CdbDebugEventCallback(m_engine))); setDebugEventCallback(DebugEventCallbackBasePtr(new CdbDebugEventCallback(m_engine)));
updateCodeLevel(); updateCodeLevel();

2
src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
View File

@@ -79,7 +79,7 @@ STDMETHODIMP CdbDebugEventCallback::Exception(
const bool fatal = isFatalException(Exception->ExceptionCode); const bool fatal = isFatalException(Exception->ExceptionCode);
if (debugCDB) if (debugCDB)
qDebug() << Q_FUNC_INFO << "\nex=" << Exception->ExceptionCode << " fatal=" << fatal << msg; qDebug() << Q_FUNC_INFO << "\nex=" << Exception->ExceptionCode << " fatal=" << fatal << msg;
m_pEngine->manager()->showApplicationOutput(msg); m_pEngine->manager()->showApplicationOutput(msg, true);
m_pEngine->manager()->showDebuggerOutput(LogMisc, msg); m_pEngine->manager()->showDebuggerOutput(LogMisc, msg);
m_pEngine->m_d->notifyException(Exception->ExceptionCode, fatal, msg); m_pEngine->m_d->notifyException(Exception->ExceptionCode, fatal, msg);
return S_OK; return S_OK;

4
src/plugins/debugger/cdb/cdbdebugoutput.cpp
View File

@@ -81,10 +81,10 @@ void CdbDebugOutput::output(ULONG mask, const QString &msg)
emit debuggerInputPrompt(logChannel(mask), msg); emit debuggerInputPrompt(logChannel(mask), msg);
break; break;
case DebuggeeOutput: case DebuggeeOutput:
emit debuggeeOutput(msg); emit debuggeeOutput(msg, true);
break; break;
case DebuggeePromptOutput: case DebuggeePromptOutput:
emit debuggeeInputPrompt(msg); emit debuggeeInputPrompt(msg, false);
break; break;
} }
} }

4
src/plugins/debugger/cdb/cdbdebugoutput.h
View File

@@ -50,8 +50,8 @@ protected:
signals: signals:
void debuggerOutput(int channel, const QString &message); void debuggerOutput(int channel, const QString &message);
void debuggerInputPrompt(int channel, const QString &message); void debuggerInputPrompt(int channel, const QString &message);
void debuggeeOutput(const QString &message); void debuggeeOutput(const QString &message, bool onStderr);
void debuggeeInputPrompt(const QString &message); void debuggeeInputPrompt(const QString &message, bool onStderr);
}; };
} // namespace Internal } // namespace Internal