feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Resuscitate the "Configure Android options" InfoBar entry

Browse Source 
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:
Alessandro Portale
2024-01-08 20:57:01 +01:00
parent a61f9162f1
commit c4e938b407
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidplugin.cpp
View File

@@ -126,10 +126,8 @@ void AndroidPlugin::kitsRestored()
return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE); return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE);
}).isEmpty(); }).isEmpty();
if (!AndroidConfigurations::currentConfig().sdkFullyConfigured() && qtForAndroidInstalled) { if (!AndroidConfigurations::currentConfig().sdkFullyConfigured() && qtForAndroidInstalled)
connect(Core::ICore::instance(), &Core::ICore::coreOpened, this, askUserAboutAndroidSetup();
&AndroidPlugin::askUserAboutAndroidSetup, Qt::QueuedConnection);
}
AndroidConfigurations::registerNewToolChains(); AndroidConfigurations::registerNewToolChains();
AndroidConfigurations::updateAutomaticKitList(); AndroidConfigurations::updateAutomaticKitList();