Merge remote-tracking branch 'origin/7.0'

Conflicts:
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp

Change-Id: Icda34067bb89d066a3e7eb47f8cca1d62dc3ae0d

src/plugins/clangcodemodel/clangdclient.h

@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include <cppeditor/baseeditordocumentparser.h>
 #include <cppeditor/cppcodemodelsettings.h>
 #include <cppeditor/refactoringengineinterface.h>
 #include <languageclient/client.h>
@@ -90,6 +91,9 @@ public:
 
     static void handleUiHeaderChange(const QString &fileName);
 
+    void updateParserConfig(const Utils::FilePath &filePath,
+                            const CppEditor::BaseEditorDocumentParser::Configuration &config);
+
 signals:
     void indexingFinished();
     void foundReferences(const QList<Core::SearchResultItem> &items);