diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 96d4ecb3d29..edb8bd5ce8b 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -79,6 +79,9 @@ QList AndroidDeployQtStepFactory::availableCreationIds(ProjectExplorer return QList(); if (parent->contains(AndroidDeployQtStep::Id)) return QList(); + QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(parent->target()->kit()); + if (!qtVersion || qtVersion->qtVersion() < QtSupport::QtVersionNumber(5, 2, 0)) + return QList(); return QList() << AndroidDeployQtStep::Id; } diff --git a/src/plugins/android/androiddeploystepfactory.cpp b/src/plugins/android/androiddeploystepfactory.cpp index 07e879b86b1..b0f6a263f64 100644 --- a/src/plugins/android/androiddeploystepfactory.cpp +++ b/src/plugins/android/androiddeploystepfactory.cpp @@ -58,6 +58,9 @@ QList AndroidDeployStepFactory::availableCreationIds(BuildStepList *pa return QList(); if (parent->contains(AndroidDeployStep::Id)) return QList(); + QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(parent->target()->kit()); + if (qtVersion && qtVersion->qtVersion() >= QtSupport::QtVersionNumber(5, 2, 0)) + return QList(); return QList() << AndroidDeployStep::Id; } diff --git a/src/plugins/android/androidpackagecreationfactory.cpp b/src/plugins/android/androidpackagecreationfactory.cpp index 2bc7e7460fa..6d19e081aab 100644 --- a/src/plugins/android/androidpackagecreationfactory.cpp +++ b/src/plugins/android/androidpackagecreationfactory.cpp @@ -36,6 +36,8 @@ #include #include +#include + using namespace ProjectExplorer; namespace Android { @@ -54,6 +56,9 @@ QList AndroidPackageCreationFactory::availableCreationIds(BuildStepLis return QList(); if (parent->contains(AndroidPackageCreationStep::CreatePackageId)) return QList(); + QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(parent->target()->kit()); + if (qtVersion && qtVersion->qtVersion() >= QtSupport::QtVersionNumber(5, 2, 0)) + return QList(); return QList() << AndroidPackageCreationStep::CreatePackageId; }