Commit a807efec authored by Daniel Teske's avatar Daniel Teske

AndroidPlugin: Fix automatic creation of Kits being run to early

Task-number: QTCREATORBUG-8819
Change-Id: I2b78706ed7e090ed66ad412fb8600b0f73a7323e
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent cf2ddce7
......@@ -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
......
......@@ -44,6 +44,8 @@ public:
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
private slots:
void kitsRestored();
};
} // namespace Android
......
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