forked from qt-creator/qt-creator
Android: Resuscitate the "Configure Android options" InfoBar entry
The restoring of Kits was moved to a later stage of the startup sequence. That is too late to connect to ICore::coreOpened. This change calls askUserAboutAndroidSetup directly instead of via connection. Fixes: QTCREATORBUG-30131 Change-Id: I9b33df42177de05f2f9132ff3126fe03ffb8df20 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -126,10 +126,8 @@ void AndroidPlugin::kitsRestored()
|
||||
return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE);
|
||||
}).isEmpty();
|
||||
|
||||
if (!AndroidConfigurations::currentConfig().sdkFullyConfigured() && qtForAndroidInstalled) {
|
||||
connect(Core::ICore::instance(), &Core::ICore::coreOpened, this,
|
||||
&AndroidPlugin::askUserAboutAndroidSetup, Qt::QueuedConnection);
|
||||
}
|
||||
if (!AndroidConfigurations::currentConfig().sdkFullyConfigured() && qtForAndroidInstalled)
|
||||
askUserAboutAndroidSetup();
|
||||
|
||||
AndroidConfigurations::registerNewToolChains();
|
||||
AndroidConfigurations::updateAutomaticKitList();
|
||||
|
Reference in New Issue
Block a user