aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidplugin.cpp
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2013-02-28 15:07:01 +0100
committerTobias Hunger <[email protected]>2013-02-28 18:12:11 +0100
commit519a365962cb238d33ae61064c9ec2a7afec9386 (patch)
tree8ee739848a3ecbe99246b9afa5260d69088d7382 /src/plugins/android/androidplugin.cpp
parent60cea5e162ec8bd1d4422cd0a2f21c5eeabc8034 (diff)
ToolChainKitInformation: Make use of ToolChainManager::isLoaded()
Warn when trying to access values not yet initialized, and avoid doing so. Also invalidate toolchains in kits properly. Change-Id: I3a98a2ca89ce43d9982d37bdee451c5122c788b2 Reviewed-by: Daniel Teske <[email protected]>
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
-rw-r--r--src/plugins/android/androidplugin.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 3b594746353..8592bc1618f 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -78,13 +78,10 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
ProjectExplorer::DeviceManager::instance()
->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice));
- return true;
-}
-
-void AndroidPlugin::extensionsInitialized()
-{
- connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()),
+ connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()),
this, SLOT(kitsRestored()));
+
+ return true;
}
void AndroidPlugin::kitsRestored()