Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/debugger/sourceagent.cpp b/src/plugins/debugger/sourceagent.cpp
index 210528bf13..d944a20b1c 100644
--- a/src/plugins/debugger/sourceagent.cpp
+++ b/src/plugins/debugger/sourceagent.cpp
@@ -137,7 +137,7 @@ void SourceAgent::updateLocationMarker()
     QTC_ASSERT(d->editor, return);
 
     if (d->locationMark)
-        d->editor->markableInterface()->removeMark(d->locationMark);
+        d->editor->textDocument()->markableInterface()->removeMark(d->locationMark);
     delete d->locationMark;
     d->locationMark = 0;
     if (d->engine->stackHandler()->currentFrame().file == d->path) {
@@ -145,7 +145,7 @@ void SourceAgent::updateLocationMarker()
         d->locationMark = new TextEditor::ITextMark(lineNumber);
         d->locationMark->setIcon(debuggerCore()->locationMarkIcon());
         d->locationMark->setPriority(TextEditor::ITextMark::HighPriority);
-        d->editor->markableInterface()->addMark(d->locationMark);
+        d->editor->textDocument()->markableInterface()->addMark(d->locationMark);
         QPlainTextEdit *plainTextEdit = qobject_cast<QPlainTextEdit *>(d->editor->widget());
         QTC_ASSERT(plainTextEdit, return);
         QTextCursor tc = plainTextEdit->textCursor();