Merge remote-tracking branch 'origin/4.4'

Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a

1 files changed, 8 insertions, 0 deletions

diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp
index c5a9d40e2e..d31a4eb899 100644
--- a/src/plugins/cppeditor/cppeditordocument.cpp
+++ b/src/plugins/cppeditor/cppeditordocument.cpp
@@ -201,12 +201,17 @@ void CppEditorDocument::onAboutToReload()
 {
     QTC_CHECK(!m_fileIsBeingReloaded);
     m_fileIsBeingReloaded = true;
+
+    processor()->invalidateDiagnostics();
 }
 
 void CppEditorDocument::onReloadFinished()
 {
     QTC_CHECK(m_fileIsBeingReloaded);
     m_fileIsBeingReloaded = false;
+
+    m_processorRevision = document()->revision();
+    processDocument();
 }
 
 void CppEditorDocument::reparseWithPreferredParseContext(const QString &parseContextId)
@@ -250,6 +255,9 @@ void CppEditorDocument::onFilePathChanged(const Utils::FileName &oldPath,
 
 void CppEditorDocument::scheduleProcessDocument()
 {
+    if (m_fileIsBeingReloaded)
+        return;
+
     m_processorRevision = document()->revision();
     m_processorTimer.start();
     processor()->editorDocumentTimerRestarted();