Merge remote-tracking branch 'origin/13.0'

Conflicts:
	src/plugins/debugger/gdb/gdbsettings.cpp
	src/plugins/perfprofiler/perfprofilerruncontrol.cpp

Change-Id: I0d5b914f9d9b5499920a5db484ef77af6ae748d5

src/plugins/ios/createsimulatordialog.cpp

@@ -71,10 +71,7 @@ CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent)
     populateRuntimes(DeviceTypeInfo());
 }
 
-CreateSimulatorDialog::~CreateSimulatorDialog()
-{
-    m_futureSync.waitForFinished();
-}
+CreateSimulatorDialog::~CreateSimulatorDialog() = default;
 
 /*!
     Returns the simulator name entered by user.

src/plugins/ios/createsimulatordialog.h

@@ -35,12 +35,12 @@ private:
     void populateDeviceTypes(const QList<DeviceTypeInfo> &deviceTypes);
     void populateRuntimes(const DeviceTypeInfo &deviceType);
 
-    Utils::FutureSynchronizer m_futureSync;
     QList<RuntimeInfo> m_runtimes;
 
     QLineEdit *m_nameEdit;
     QComboBox *m_deviceTypeCombo;
     QComboBox *m_runtimeCombo;
+    Utils::FutureSynchronizer m_futureSync; // Keep me last
 };
 
 } // Ios::Internal

src/plugins/ios/iosconfigurations.cpp

@@ -305,8 +305,7 @@ void IosConfigurations::updateAutomaticKitList()
     existingKits.subtract(resultingKits);
     qCDebug(kitSetupLog) << "Removing unused kits:";
     printKits(existingKits);
-    for (Kit *kit : std::as_const(existingKits))
-        KitManager::deregisterKit(kit);
+    KitManager::deregisterKits(toList(existingKits));
 }
 
 static IosConfigurations *m_instance = nullptr;