diff options
| author | dt <qtc-committer@nokia.com> | 2009-03-11 11:49:38 +0100 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2009-03-11 11:49:38 +0100 |
| commit | c395680eb66ed79bb1036f2f859cb677224a91b8 (patch) | |
| tree | 86d915c2c8748570fb2096dad52336442f700b81 /src/plugins/debugger/gdbengine.cpp | |
| parent | e8d990e72c9af7e268e24e1b23ab618b93378a99 (diff) | |
| parent | c0b1386361695fca7865a79af193c74c3d2ac495 (diff) | |
| download | qt-creator-c395680eb66ed79bb1036f2f859cb677224a91b8.tar.gz | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts:
src/plugins/debugger/gdbengine.cpp
Diffstat (limited to 'src/plugins/debugger/gdbengine.cpp')
| -rw-r--r-- | src/plugins/debugger/gdbengine.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp index fbbd0ecf5d..ac10f32030 100644 --- a/src/plugins/debugger/gdbengine.cpp +++ b/src/plugins/debugger/gdbengine.cpp @@ -1140,7 +1140,8 @@ void GdbEngine::handleAqcuiredInferior() #if defined(Q_OS_MAC) sendCommand("info pid", GdbInfoProc, QVariant(), NeedsStop); #endif - //reloadSourceFiles(); + if (qq->wantsSourceFileList()) + reloadSourceFiles(); tryLoadCustomDumpers(); #ifndef Q_OS_MAC @@ -1297,7 +1298,12 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data) frame.findChild("func").data() + '%'; QApplication::alert(q->mainWindow(), 3000); +<<<<<<< HEAD:src/plugins/debugger/gdbengine.cpp //reloadSourceFiles(); +======= + if (qq->wantsSourceFileList()) + reloadSourceFiles(); +>>>>>>> c0b1386361695fca7865a79af193c74c3d2ac495:src/plugins/debugger/gdbengine.cpp sendCommand("-break-list", BreakList); QVariant var = QVariant::fromValue<GdbMi>(data); sendCommand("p 0", GdbAsyncOutput2, var); // dummy @@ -1556,6 +1562,7 @@ int GdbEngine::currentFrame() const bool GdbEngine::startDebugger() { + debugMessage(q->settings()->dump()); QStringList gdbArgs; if (m_gdbProc.state() != QProcess::NotRunning) { |