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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	src/plugins/debugger/disassembleragent.cpp
This commit is contained in:
dt
2011-03-21 17:48:19 +01:00
parent 6fd2aaaa32 5a186ceaa4
commit 4f278cbfed
168 changed files with 3038 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/disassembleragent.cpp
View File

@@ -86,12 +86,14 @@ public:
QHash<QString, DisassemblerLines> cache;
QString mimeType;
bool m_resetLocationScheduled;
};
DisassemblerAgentPrivate::DisassemblerAgentPrivate()
: editor(0),
tryMixed(true),
mimeType(_("text/x-qtcreator-generic-asm"))
mimeType(_("text/x-qtcreator-generic-asm")),
m_resetLocationScheduled(false)
{
locationMark = new ITextMark;
locationMark->setIcon(debuggerCore()->locationMarkIcon());
@@ -133,11 +135,19 @@ void DisassemblerAgent::cleanup()
d->cache.clear();
}
void DisassemblerAgent::scheduleResetLocation()
{
d->m_resetLocationScheduled = true;
}
void DisassemblerAgent::resetLocation()
{
if (!d->editor)
return;
d->editor->markableInterface()->removeMark(d->locationMark);
if (d->m_resetLocationScheduled) {
d->m_resetLocationScheduled = false;
d->editor->markableInterface()->removeMark(d->locationMark);
}
}
static QString frameKey(const Location &loc)