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

Debugger: Restrict LocationMark dragging

Browse Source 
... to engines that actually support JumpToLine and make it
work in disassembler views.

Change-Id: I10368ea719587caa7c4f33665eff57c2bf300d84
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-07-17 16:33:25 +02:00
parent ff63fd113a
commit db80d20f30
6 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -552,25 +552,6 @@ static Kit *findUniversalCdbKit()
return KitManager::find(cdbMatcher());
}
static bool currentTextEditorPosition(ContextData *data)
{
BaseTextEditor *textEditor = BaseTextEditor::currentTextEditor();
if (!textEditor)
return false;
const TextDocument *document = textEditor->textDocument();
QTC_ASSERT(document, return false);
data->fileName = document->filePath().toString();
if (document->property(Constants::OPENED_WITH_DISASSEMBLY).toBool()) {
int lineNumber = textEditor->currentLine();
QString line = textEditor->textDocument()->plainText()
.section(QLatin1Char('\n'), lineNumber - 1, lineNumber - 1);
data->address = DisassemblerLine::addressFromDisassemblyLine(line);
} else {
data->lineNumber = textEditor->currentLine();
}
return true;
}
///////////////////////////////////////////////////////////////////////
//
// DebuggerPluginPrivate
@@ -848,17 +829,17 @@ public slots:
void handleExecJumpToLine()
{
currentEngine()->resetLocation();
ContextData data;
if (currentTextEditorPosition(&data))
currentEngine()->executeJumpToLine(data);
if (BaseTextEditor *textEditor = BaseTextEditor::currentTextEditor())
currentEngine()->executeJumpToLine(getLocationContext(textEditor->textDocument(),
textEditor->currentLine()));
}
void handleExecRunToLine()
{
currentEngine()->resetLocation();
ContextData data;
if (currentTextEditorPosition(&data))
currentEngine()->executeRunToLine(data);
if (BaseTextEditor *textEditor = BaseTextEditor::currentTextEditor())
currentEngine()->executeRunToLine(getLocationContext(textEditor->textDocument(),
textEditor->currentLine()));
}
void handleExecRunToSelectedFunction()