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

Merge branch 'origin/1.3' (early part)

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/trkgdbadapter.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
	src/plugins/texteditor/basetexteditor.cpp
This commit is contained in:
Oswald Buddenhagen
2010-01-29 22:14:44 +01:00
parent 3afe252e1f 07da7ccfdf
commit 4320314046
6 changed files with 220 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -203,7 +203,6 @@ void Snapshot::insertMemory(const MemoryRange &range, const QByteArray &ba)
// Not combinable, add chunk.
memory.insert(range, ba);
}
///////////////////////////////////////////////////////////////////////////
//
// TrkGdbAdapter
@@ -1795,8 +1794,7 @@ void TrkGdbAdapter::handleCreateProcess(const TrkResult &result)
logMessage(startMsg);
const QByteArray symbolFile = m_symbolFile.toLocal8Bit();
if (symbolFile.isEmpty()) {
if (m_symbolFile.isEmpty()) {
logMessage(_("WARNING: No symbol file available."));
} else {
// Does not seem to be necessary anymore.
@@ -1804,7 +1802,7 @@ void TrkGdbAdapter::handleCreateProcess(const TrkResult &result)
// have to wait for the TRK startup to learn the load address.
//m_engine->postCommand("add-symbol-file \"" + symbolFile + "\" "
// + QByteArray::number(m_session.codeseg));
m_engine->postCommand("symbol-file \"" + symbolFile + "\"");
m_engine->postCommand("symbol-file \"" + m_symbolFile.toLatin1() + "\"");
}
m_engine->postCommand("set breakpoint always-inserted on");
m_engine->postCommand("set trust-readonly-sections"); // No difference?