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

Merge branch 'debugintegration'

Browse Source 
Conflicts:
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
This commit is contained in:
Lasse Holmstedt
2010-02-16 16:30:41 +01:00
parent 5262ca2061 580280af26
commit 4e5089d90d
28 changed files with 1275 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -33,6 +33,8 @@
#include "gdboptionspage.h"
#include "trkoptions.h"
#include "trkoptionspage.h"
#include "debugger/debuggeruiswitcher.h"
#include "debugger/debuggermainwindow.h"
#include "attachgdbadapter.h"
#include "coregdbadapter.h"
@@ -210,7 +212,7 @@ DebuggerStartMode GdbEngine::startMode() const
QMainWindow *GdbEngine::mainWindow() const
{
return m_manager->mainWindow();
return DebuggerUISwitcher::instance()->mainWindow();
}
GdbEngine::~GdbEngine()
@@ -3740,7 +3742,7 @@ void GdbEngine::handleFetchDisassemblerByLine(const GdbResponse &response)
} else {
// Can happen e.g. for initializer list on symbian/rvct where
// we get a file name and line number but where the 'fully
// disassembled function' does not cover the code in the
// disassembled function' does not cover the code in the
// initializer list. Fall back needed:
//fetchDisassemblerByAddress(ac.agent, true);
fetchDisassemblerByCli(ac.agent, true);
@@ -3749,7 +3751,7 @@ void GdbEngine::handleFetchDisassemblerByLine(const GdbResponse &response)
} else {
// 536^error,msg="mi_cmd_disassemble: Invalid line number"
QByteArray msg = response.data.findChild("msg").data();
if (msg == "mi_cmd_disassemble: Invalid line number"
if (msg == "mi_cmd_disassemble: Invalid line number"
|| msg.startsWith("Cannot access memory at address"))
fetchDisassemblerByAddress(ac.agent, true);
else