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

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

Browse Source 
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>
This commit is contained in:
Assam Boudjelthia
2020-02-10 15:02:36 +02:00
parent f4769d7931
commit 9645906ae2
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,10 +159,6 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
d = new AndroidPluginPrivate; d = new AndroidPluginPrivate;
if (!AndroidConfigurations::currentConfig().sdkFullyConfigured()) {
connect(Core::ICore::instance(), &Core::ICore::coreOpened, this,
&AndroidPlugin::askUserAboutAndroidSetup, Qt::QueuedConnection);
}
connect(KitManager::instance(), &KitManager::kitsLoaded, connect(KitManager::instance(), &KitManager::kitsLoaded,
this, &AndroidPlugin::kitsRestored); this, &AndroidPlugin::kitsRestored);
@@ -171,6 +167,16 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
void AndroidPlugin::kitsRestored() 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(); AndroidConfigurations::updateAutomaticKitList();
connect(QtSupport::QtVersionManager::instance(), &QtSupport::QtVersionManager::qtVersionsChanged, connect(QtSupport::QtVersionManager::instance(), &QtSupport::QtVersionManager::qtVersionsChanged,
AndroidConfigurations::instance(), &AndroidConfigurations::updateAutomaticKitList); AndroidConfigurations::instance(), &AndroidConfigurations::updateAutomaticKitList);