diff options
| author | Daniel Teske <[email protected]> | 2013-02-25 13:25:32 +0100 |
|---|---|---|
| committer | Daniel Teske <[email protected]> | 2013-02-25 15:08:35 +0100 |
| commit | a807efec12596eff942b4cdb47836a627bfe890e (patch) | |
| tree | d362428f9b6fee48985fae3de8f1aaa47eaf2e6f /src/plugins/android/androidplugin.cpp | |
| parent | cf2ddce7ef0cbac2436efb84ad9013fa8ec3eba7 (diff) | |
AndroidPlugin: Fix automatic creation of Kits being run to early
Task-number: QTCREATORBUG-8819
Change-Id: I2b78706ed7e090ed66ad412fb8600b0f73a7323e
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
| -rw-r--r-- | src/plugins/android/androidplugin.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index cf7cf0783fa..b1a67572ab3 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -44,7 +44,7 @@ #include "androidqtversionfactory.h" #include "androiddeployconfiguration.h" #include "androidgdbserverkitinformation.h" - +#include <projectexplorer/kitmanager.h> #include <qtsupport/qtversionmanager.h> #include <QtPlugin> @@ -82,8 +82,17 @@ void AndroidPlugin::extensionsInitialized() ProjectExplorer::DeviceManager *dm = ProjectExplorer::DeviceManager::instance(); if (dm->find(Core::Id(Constants::ANDROID_DEVICE_ID)).isNull()) dm->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice)); + connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), + this, SLOT(kitsRestored())); +} + +void AndroidPlugin::kitsRestored() +{ + Internal::AndroidConfigurations::instance().updateAutomaticKitList(); connect(QtSupport::QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)), &Internal::AndroidConfigurations::instance(), SLOT(updateAutomaticKitList())); + disconnect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), + this, SLOT(kitsRestored())); } } // namespace Android |