From c4e938b407674b99b9570cc6986059ac2541e122 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 8 Jan 2024 20:57:01 +0100 Subject: [PATCH] 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 --- src/plugins/android/androidplugin.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 9eeee4dad29..0430973b5df 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -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();