diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp index 19f38b12137..f0eba970535 100644 --- a/src/plugins/android/androidpotentialkit.cpp +++ b/src/plugins/android/androidpotentialkit.cpp @@ -74,7 +74,7 @@ bool AndroidPotentialKit::isEnabled() const } 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); }); } diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 540bf6f0d2b..7376f10a737 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -96,7 +96,8 @@ bool AndroidQtVersion::supportsMultipleQtAbis() const Abis AndroidQtVersion::detectQtAbis() const { - return Utils::transform(androidAbis(), &AndroidManager::androidAbi2Abi); + const bool conf = AndroidConfigurations::currentConfig().sdkFullyConfigured(); + return conf ? Utils::transform(androidAbis(), &AndroidManager::androidAbi2Abi) : Abis(); } void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const