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

Android: Don't show 2 issues per Android Qt if unconfigured SDK

Browse Source 
Only call registerNewToolChains() and updateAutomaticKitList() if the
Android SDK is configured and the required environment for the mkspec/
qmake parsing is set.

Fixes: QTCREATORBUG-27805
Change-Id: I66eca659074afeea97a894cc418a95675e46ff1e
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2022-07-07 13:39:50 +02:00
parent d3a40b1d04
commit 9f469cef11
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidpotentialkit.cpp
View File

@@ -74,7 +74,7 @@ bool AndroidPotentialKit::isEnabled() const
} }
return QtSupport::QtVersionManager::version([](const QtSupport::QtVersion *v) { return QtSupport::QtVersionManager::version([](const QtSupport::QtVersion *v) {
return v->isValid() && v->type() == QString::fromLatin1(Constants::ANDROID_QT_TYPE); return v->type() == QString::fromLatin1(Constants::ANDROID_QT_TYPE);
}); });
} }

3
src/plugins/android/androidqtversion.cpp
View File

@@ -96,7 +96,8 @@ bool AndroidQtVersion::supportsMultipleQtAbis() const
Abis AndroidQtVersion::detectQtAbis() const Abis AndroidQtVersion::detectQtAbis() const
{ {
return Utils::transform<Abis>(androidAbis(), &AndroidManager::androidAbi2Abi); const bool conf = AndroidConfigurations::currentConfig().sdkFullyConfigured();
return conf ? Utils::transform<Abis>(androidAbis(), &AndroidManager::androidAbi2Abi) : Abis();
} }
void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const