Merge remote-tracking branch 'origin/3.3'

2014-12-01 15:44:30 +01:00
parent 34a48645c5 d93afdeda5
commit d341c48246
55 changed files with 699 additions and 340 deletions
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -7077,6 +7077,12 @@ void TextEditorWidget::inSnippetMode(bool *active)

 void TextEditorWidget::invokeAssist(AssistKind kind, IAssistProvider *provider)
 {
+    if (kind == QuickFix && d->m_snippetOverlay->isVisible()) {
+        d->m_snippetOverlay->setVisible(false);
+        d->m_snippetOverlay->mangle();
+        d->m_snippetOverlay->clear();
+    }
+
    bool previousMode = overwriteMode();
    setOverwriteMode(false);
    ensureCursorVisible();