Merge remote-tracking branch 'origin/3.6'

Conflicts:
	src/libs/qmldebug/qmldebugclient.cpp
	src/libs/qmldebug/qmldebugclient.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I9594b4e9befc78f8138deb121f0bfc4212f7edbf

src/plugins/clangcodemodel/clangdiagnosticmanager.cpp

@@ -189,6 +189,11 @@ QList<QTextEdit::ExtraSelection> ClangDiagnosticManager::takeExtraSelections()
     return extraSelections;
 }
 
+void ClangDiagnosticManager::clearDiagnosticsWithFixIts()
+{
+    m_fixItdiagnostics.clear();
+}
+
 void ClangDiagnosticManager::generateEditorSelections()
 {
     m_extraSelections.clear();

src/plugins/clangcodemodel/clangdiagnosticmanager.h

@@ -56,6 +56,8 @@ public:
     const QVector<ClangBackEnd::DiagnosticContainer> &diagnosticsWithFixIts() const;
     QList<QTextEdit::ExtraSelection> takeExtraSelections();
 
+    void clearDiagnosticsWithFixIts();
+
 private:
     QString filePath() const;
     void filterDiagnostics(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics);

src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

@@ -224,6 +224,11 @@ ClangBackEnd::FileContainer ClangEditorDocumentProcessor::fileContainer() const
     return fileContainer(m_projectPart.data());
 }
 
+void ClangEditorDocumentProcessor::clearDiagnosticsWithFixIts()
+{
+    m_diagnosticManager.clearDiagnosticsWithFixIts();
+}
+
 ClangEditorDocumentProcessor *ClangEditorDocumentProcessor::get(const QString &filePath)
 {
     return qobject_cast<ClangEditorDocumentProcessor *>(BaseEditorDocumentProcessor::get(filePath));

src/plugins/clangcodemodel/clangeditordocumentprocessor.h

@@ -81,6 +81,8 @@ public:
 
     ClangBackEnd::FileContainer fileContainer() const;
 
+    void clearDiagnosticsWithFixIts();
+
 public:
     static ClangEditorDocumentProcessor *get(const QString &filePath);
 

src/plugins/clangcodemodel/clangmodelmanagersupport.cpp

@@ -197,6 +197,15 @@ void ModelManagerSupportClang::onCppDocumentReloadFinishedOnTranslationUnit(bool
     }
 }
 
+namespace {
+void clearDiagnosticFixIts(const QString &filePath)
+{
+    auto processor = ClangEditorDocumentProcessor::get(filePath);
+    if (processor)
+        processor->clearDiagnosticsWithFixIts();
+}
+}
+
 void ModelManagerSupportClang::onCppDocumentContentsChangedOnTranslationUnit(int position,
                                                                              int /*charsRemoved*/,
                                                                              int /*charsAdded*/)
@@ -206,6 +215,8 @@ void ModelManagerSupportClang::onCppDocumentContentsChangedOnTranslationUnit(int
     m_ipcCommunicator.updateChangeContentStartPosition(document->filePath().toString(),
                                                        position);
     m_ipcCommunicator.updateTranslationUnitIfNotCurrentDocument(document);
+
+    clearDiagnosticFixIts(document->filePath().toString());
 }
 
 void ModelManagerSupportClang::onCppDocumentAboutToReloadOnUnsavedFile()