diff options
| author | hjk <hjk@qt.io> | 2019-01-16 11:07:04 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-01-18 08:50:24 +0000 |
| commit | bc239e240e0d1ab2c615ed0387a3d77fc4fc2ec9 (patch) | |
| tree | 17e7ca242dbecb63ed0206ecc693c3fe717c28a2 /src/plugins/android/androiddeployconfiguration.cpp | |
| parent | 8ec2eb87a4d82712cd8e5a4afb1b41014d2ab97f (diff) | |
| download | qt-creator-bc239e240e0d1ab2c615ed0387a3d77fc4fc2ec9.tar.gz | |
Merge DeployConfigurationFactory::{canHandle,canOffer}
Previous uses of canOffer are effectively unchanged in behavior,
other plain uses of canHandle now also check the additional
requirements on the Qt version on Android (the only platform
that had a custom hasBuildTarget() implementation). This is
assumed to make no difference in practice.
Change-Id: If12895d1421d5565ff91a18bf4d7df96c8191160
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/android/androiddeployconfiguration.cpp')
| -rw-r--r-- | src/plugins/android/androiddeployconfiguration.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp index 795ac09f3c..a10bbd8e43 100644 --- a/src/plugins/android/androiddeployconfiguration.cpp +++ b/src/plugins/android/androiddeployconfiguration.cpp @@ -60,8 +60,11 @@ AndroidDeployConfigurationFactory::AndroidDeployConfigurationFactory() setDefaultDisplayName(AndroidDeployConfiguration::tr("Deploy to Android device")); } -bool AndroidDeployConfigurationFactory::hasAvailableBuildTargets(Target *parent) const +bool AndroidDeployConfigurationFactory::canHandle(Target *parent) const { + if (!DeployConfigurationFactory::canHandle(parent)) + return false; + if (!parent->project()->id().name().startsWith("QmlProjectManager.QmlProject")) { // Avoid tool chain check for QML Project Core::Id cxxLangId(ProjectExplorer::Constants::CXX_LANGUAGE_ID); |