Merge remote-tracking branch 'origin/8.0'

Conflicts:
	src/plugins/clangcodemodel/clangdclient.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp

Change-Id: Id1454bfe8e4f283f3b06ac6945aced2975814161

src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp

@@ -153,6 +153,9 @@ void CompilationDbParser::parserJobFinished()
 
 void CompilationDbParser::finish(ParseResult result)
 {
+    if (result != ParseResult::Failure)
+        m_guard.markAsSuccess();
+
     emit finished(result);
     deleteLater();
 }

src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h

@@ -69,7 +69,6 @@ public:
     QList<ProjectExplorer::FileNode *> scannedFiles() const;
     DbContents dbContents() const
     {
-        m_guard.markAsSuccess();
         return m_dbContents;
     }