Merge remote-tracking branch 'origin/7.0'

Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

Change-Id: I14030f58303839e706af892dd12a67566e3bed68

src/plugins/languageclient/languageclientquickfix.cpp

@@ -95,6 +95,7 @@ IAssistProposal *LanguageClientQuickFixAssistProcessor::perform(const AssistInte
         handleCodeActionResponse(response);
     });
 
+    m_client->addAssistProcessor(this);
     m_client->requestCodeActions(request);
     m_currentRequest = request.id();
     return nullptr;