diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index d0b8b770f50..3ceec867146 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -337,6 +337,15 @@ void IosConfigurations::initialize() m_instance = new IosConfigurations(nullptr); } +void IosConfigurations::kitsRestored() +{ + disconnect(KitManager::instance(), &KitManager::kitsLoaded, + this, &IosConfigurations::kitsRestored); + IosConfigurations::updateAutomaticKitList(); + connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, + IosConfigurations::instance(), &IosConfigurations::updateAutomaticKitList); +} + bool IosConfigurations::ignoreAllDevices() { return m_instance->m_ignoreAllDevices; @@ -386,6 +395,8 @@ IosConfigurations::IosConfigurations(QObject *parent) : QObject(parent) { load(); + connect(KitManager::instance(), &KitManager::kitsLoaded, + this, &IosConfigurations::kitsRestored); } void IosConfigurations::load() diff --git a/src/plugins/ios/iosconfigurations.h b/src/plugins/ios/iosconfigurations.h index 6312d07b416..9b3faa348e2 100644 --- a/src/plugins/ios/iosconfigurations.h +++ b/src/plugins/ios/iosconfigurations.h @@ -129,6 +129,7 @@ private: IosConfigurations(QObject *parent); void load(); void save(); + void kitsRestored(); void updateSimulators(); static void setDeveloperPath(const Utils::FileName &devPath); void initializeProvisioningData(); diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp index 39f649450c1..401b2a050c0 100644 --- a/src/plugins/ios/iosplugin.cpp +++ b/src/plugins/ios/iosplugin.cpp @@ -42,13 +42,10 @@ #include #include -#include #include #include -#include - using namespace ProjectExplorer; using namespace QtSupport; @@ -127,20 +124,8 @@ bool IosPlugin::initialize(const QStringList &arguments, QString *errorMessage) RunControl::registerWorker (ProjectExplorer::Constants::QML_PROFILER_RUN_MODE, constraint); - connect(KitManager::instance(), &KitManager::kitsLoaded, - this, &IosPlugin::kitsRestored); - return true; } -void IosPlugin::kitsRestored() -{ - disconnect(KitManager::instance(), &KitManager::kitsLoaded, - this, &IosPlugin::kitsRestored); - IosConfigurations::updateAutomaticKitList(); - connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, - IosConfigurations::instance(), &IosConfigurations::updateAutomaticKitList); -} - } // namespace Internal } // namespace Ios diff --git a/src/plugins/ios/iosplugin.h b/src/plugins/ios/iosplugin.h index 1e1fc83bc73..2a1b4f42f82 100644 --- a/src/plugins/ios/iosplugin.h +++ b/src/plugins/ios/iosplugin.h @@ -43,8 +43,6 @@ private: bool initialize(const QStringList &arguments, QString *errorMessage) final; void extensionsInitialized() final {} - void kitsRestored(); - class IosPluginPrivate *d = nullptr; };