Commit cf69783c authored by Daniel Teske's avatar Daniel Teske

Android: Restrict deployment factories to targets with the right qt

Change-Id: I753023550f76b8b1b56fbdcd5176bcfa855e66bc
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 713e4dd5
...@@ -79,6 +79,9 @@ QList<Core::Id> AndroidDeployQtStepFactory::availableCreationIds(ProjectExplorer ...@@ -79,6 +79,9 @@ QList<Core::Id> AndroidDeployQtStepFactory::availableCreationIds(ProjectExplorer
return QList<Core::Id>(); return QList<Core::Id>();
if (parent->contains(AndroidDeployQtStep::Id)) if (parent->contains(AndroidDeployQtStep::Id))
return QList<Core::Id>(); return QList<Core::Id>();
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(parent->target()->kit());
if (!qtVersion || qtVersion->qtVersion() < QtSupport::QtVersionNumber(5, 2, 0))
return QList<Core::Id>();
return QList<Core::Id>() << AndroidDeployQtStep::Id; return QList<Core::Id>() << AndroidDeployQtStep::Id;
} }
......
...@@ -58,6 +58,9 @@ QList<Core::Id> AndroidDeployStepFactory::availableCreationIds(BuildStepList *pa ...@@ -58,6 +58,9 @@ QList<Core::Id> AndroidDeployStepFactory::availableCreationIds(BuildStepList *pa
return QList<Core::Id>(); return QList<Core::Id>();
if (parent->contains(AndroidDeployStep::Id)) if (parent->contains(AndroidDeployStep::Id))
return QList<Core::Id>(); return QList<Core::Id>();
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(parent->target()->kit());
if (qtVersion && qtVersion->qtVersion() >= QtSupport::QtVersionNumber(5, 2, 0))
return QList<Core::Id>();
return QList<Core::Id>() << AndroidDeployStep::Id; return QList<Core::Id>() << AndroidDeployStep::Id;
} }
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/qtkitinformation.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace Android { namespace Android {
...@@ -54,6 +56,9 @@ QList<Core::Id> AndroidPackageCreationFactory::availableCreationIds(BuildStepLis ...@@ -54,6 +56,9 @@ QList<Core::Id> AndroidPackageCreationFactory::availableCreationIds(BuildStepLis
return QList<Core::Id>(); return QList<Core::Id>();
if (parent->contains(AndroidPackageCreationStep::CreatePackageId)) if (parent->contains(AndroidPackageCreationStep::CreatePackageId))
return QList<Core::Id>(); return QList<Core::Id>();
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(parent->target()->kit());
if (qtVersion && qtVersion->qtVersion() >= QtSupport::QtVersionNumber(5, 2, 0))
return QList<Core::Id>();
return QList<Core::Id>() << AndroidPackageCreationStep::CreatePackageId; return QList<Core::Id>() << AndroidPackageCreationStep::CreatePackageId;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment