Merge remote-tracking branch 'origin/2.5'

2012-05-07 15:18:39 +02:00
parent d7f6bc3369 b63135c067
commit 529c0a8fe2
36 changed files with 7212 additions and 1120 deletions
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -648,6 +648,7 @@ void DebuggerEngine::gotoLocation(const Location &loc)
        d->m_locationMark.reset(new TextEditor::BaseTextMark(file, line));
        d->m_locationMark->setIcon(debuggerCore()->locationMarkIcon());
        d->m_locationMark->setPriority(TextEditor::ITextMark::HighPriority);
+        d->m_locationMark->init();
    }

    // FIXME: Breaks with split views.