Android: don't show Android info bar if Android version is installed

If no Qt for Android version is installed don't show the config info
bar.

Fixes: QTCREATORBUG-23580
Change-Id: I880594701cdd6d5c0fc0586b5e49cc6a66efedb7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 10 insertions, 4 deletions

diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 93850bb483..43a50e29e3 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -159,10 +159,6 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
 
     d = new AndroidPluginPrivate;
 
-    if (!AndroidConfigurations::currentConfig().sdkFullyConfigured()) {
-        connect(Core::ICore::instance(), &Core::ICore::coreOpened, this,
-                &AndroidPlugin::askUserAboutAndroidSetup, Qt::QueuedConnection);
-    }
     connect(KitManager::instance(), &KitManager::kitsLoaded,
             this, &AndroidPlugin::kitsRestored);
 
@@ -171,6 +167,16 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
 
 void AndroidPlugin::kitsRestored()
 {
+    const bool qtForAndroidInstalled
+        = !QtSupport::QtVersionManager::versions([](const QtSupport::BaseQtVersion *v) {
+               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);
+    }
+
     AndroidConfigurations::updateAutomaticKitList();
     connect(QtSupport::QtVersionManager::instance(), &QtSupport::QtVersionManager::qtVersionsChanged,
             AndroidConfigurations::instance(), &AndroidConfigurations::updateAutomaticKitList);