Merge remote-tracking branch 'origin/8.0'

Conflicts:
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp

Change-Id: I5106bb632c2a3a144287097137be45b0894b9ee4

src/plugins/cppeditor/cppquickfixes.cpp

@@ -4189,9 +4189,12 @@ void GetterSetterRefactoringHelper::performGeneration(ExistingGetterSetterData d
 
     // member variable
     if (generateFlags & Flag::GenerateMemberVariable) {
-        const QString storageDeclaration = overview.prettyType(memberVariableType,
-                                                               data.memberVariableName)
-                                           + QLatin1String(";\n");
+        QString storageDeclaration = overview.prettyType(memberVariableType, data.memberVariableName);
+        if (memberVariableType->asPointerType()
+            && m_operation->semanticInfo().doc->translationUnit()->languageFeatures().cxx11Enabled) {
+            storageDeclaration.append(" = nullptr");
+        }
+        storageDeclaration.append(";\n");
         addHeaderCode(InsertionPointLocator::Private, storageDeclaration);
     }