Merge remote-tracking branch 'origin/4.14'

Conflicts:
	src/plugins/mesonprojectmanager/project/mesonprojectparser.h

Change-Id: Id38d20ce20981dcdc322fe5d1d7647f4bec89d8a

src/plugins/cppeditor/cppquickfixes.cpp

@@ -3070,6 +3070,7 @@ public:
         oo.showReturnTypes = true;
         oo.showArgumentNames = true;
         oo.showEnclosingTemplate = true;
+        oo.showTemplateParameters = true;
 
         if (defPos == DefPosInsideClass) {
             const int targetPos = targetFile->position(loc.line(), loc.column());