diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2014-03-06 15:44:13 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-03-07 15:56:43 +0100 |
commit | c9b6897e787a7f8d9cbbc6636aa2e053fa638090 (patch) | |
tree | f8db167acc16e8f29094f5397f75ab76c1d0fd7a /src/plugins/debugger/disassembleragent.cpp | |
parent | d52ee686d1ae63090e066faf4e2b66b90620b774 (diff) | |
download | qt-creator-c9b6897e787a7f8d9cbbc6636aa2e053fa638090.tar.gz |
EditorManager: Add OpenEditorFlags to openEditorWithContents
This requires moving the activateEditor call into openEditorWithContents.
Remove that line elsewhere when editors are constructed. Keep it when
reusing an existing editor though.
Change-Id: I872f03e16fde42f3b8adec2cf2344b7cc495cd08
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/debugger/disassembleragent.cpp')
-rw-r--r-- | src/plugins/debugger/disassembleragent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index 2fec392687..974c5abb86 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -316,10 +316,10 @@ void DisassemblerAgent::setContentsToEditor(const DisassemblerLines &contents) qobject_cast<BaseTextEditorWidget *>(d->editor->widget()); if (baseTextEdit) baseTextEdit->setRequestMarkEnabled(true); + } else { + EditorManager::activateEditor(d->editor); } - EditorManager::activateEditor(d->editor); - QPlainTextEdit *plainTextEdit = qobject_cast<QPlainTextEdit *>(d->editor->widget()); QTC_ASSERT(plainTextEdit, return); |