1 files changed, 8 insertions, 7 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 9dda5035a5..faa9c9ca28 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -346,6 +346,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     d->m_kitManager = new KitManager; // register before ToolChainManager
     new DeviceManager; // Create DeviceManager singleton
     d->m_toolChainManager = new ToolChainManager;
+
+    // Register KitInformation:
+    KitManager::instance()->registerKitInformation(new DeviceTypeKitInformation);
+    KitManager::instance()->registerKitInformation(new DeviceKitInformation);
+    KitManager::instance()->registerKitInformation(new SysRootKitInformation);
+
     addAutoReleasedObject(new Internal::ToolChainOptionsPage);
     addAutoReleasedObject(new KitOptionsPage);
 
@@ -1119,15 +1125,10 @@ void ProjectExplorerPlugin::extensionsInitialized()
 
     // Register KitInformation:
     // Only do this now to make sure all device factories were properly initialized.
-    KitManager::instance()->registerKitInformation(new SysRootKitInformation);
-    KitManager::instance()->registerKitInformation(new DeviceKitInformation);
-    KitManager::instance()->registerKitInformation(new DeviceTypeKitInformation);
     KitManager::instance()->registerKitInformation(new ToolChainKitInformation);
 
-    DeviceManager *dm = DeviceManager::instance();
-    if (dm->find(Core::Id(Constants::DESKTOP_DEVICE_ID)).isNull())
-        DeviceManager::instance()->addDevice(IDevice::Ptr(new DesktopDevice));
-    dm->load();
+    DeviceManager::instance()->addDevice(IDevice::Ptr(new DesktopDevice));
+    DeviceManager::instance()->load();
     d->m_toolChainManager->restoreToolChains();
     d->m_kitManager->restoreKits();
 }