Merge remote-tracking branch 'origin/3.0'

Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

Change-Id: If62ec06ea069a7eba6735101e5334b0c1f66861f

src/plugins/valgrind/valgrindsettings.cpp

@@ -414,6 +414,7 @@ void ValgrindGlobalSettings::readSettings()
 
     defaults.insert(QLatin1String(callgrindCostFormatC), CostDelegate::FormatRelative);
     defaults.insert(QLatin1String(callgrindCycleDetectionC), true);
+    defaults.insert(QLatin1String(callgrindShortenTemplates), true);
 
     // Read stored values
     QSettings *settings = Core::ICore::settings();