Commit f462e6f3 authored by Daniel Teske's avatar Daniel Teske

AndroidDevice: Update after the device manager has actually loaded

Change-Id: Ibab03ef09dea6312a0d4c812c819d847b1399298
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
parent 5a283777
......@@ -698,7 +698,6 @@ void AndroidConfigurations::load()
settings->beginGroup(SettingsGroup);
m_config = AndroidConfig(*settings);
settings->endGroup();
updateAndroidDevice();
}
void AndroidConfigurations::updateAndroidDevice()
......
......@@ -115,6 +115,9 @@ public:
static QLatin1String toolchainPrefix(ProjectExplorer::Abi::Architecture architecture);
static QLatin1String toolsPrefix(ProjectExplorer::Abi::Architecture architecture);
// called from AndroidPlugin
void updateAndroidDevice();
signals:
void updated();
......@@ -132,7 +135,6 @@ private:
int getSDKVersion(const QString &device) const;
void updateAvailablePlatforms();
void updateAndroidDevice();
static AndroidConfigurations *m_instance;
......
......@@ -77,6 +77,9 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()),
this, SLOT(kitsRestored()));
connect(ProjectExplorer::DeviceManager::instance(), SIGNAL(devicesLoaded()),
this, SLOT(updateDevice()));
return true;
}
......@@ -89,6 +92,11 @@ void AndroidPlugin::kitsRestored()
this, SLOT(kitsRestored()));
}
void AndroidPlugin::updateDevice()
{
Internal::AndroidConfigurations::instance().updateAndroidDevice();
}
} // namespace Android
Q_EXPORT_PLUGIN(Android::AndroidPlugin)
......@@ -46,6 +46,7 @@ public:
void extensionsInitialized() { }
private slots:
void updateDevice();
void kitsRestored();
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment