From cf69783c0ff0fbe59f6d5bb11348abc0ee28a334 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 9 Oct 2013 17:16:01 +0200
Subject: [PATCH] Android: Restrict deployment factories to targets with the
 right qt

Change-Id: I753023550f76b8b1b56fbdcd5176bcfa855e66bc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/android/androiddeployqtstep.cpp           | 3 +++
 src/plugins/android/androiddeploystepfactory.cpp      | 3 +++
 src/plugins/android/androidpackagecreationfactory.cpp | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 96d4ecb3d2..edb8bd5ce8 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -79,6 +79,9 @@ QList<Core::Id> AndroidDeployQtStepFactory::availableCreationIds(ProjectExplorer
         return QList<Core::Id>();
     if (parent->contains(AndroidDeployQtStep::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;
 }
 
diff --git a/src/plugins/android/androiddeploystepfactory.cpp b/src/plugins/android/androiddeploystepfactory.cpp
index 07e879b86b..b0f6a263f6 100644
--- a/src/plugins/android/androiddeploystepfactory.cpp
+++ b/src/plugins/android/androiddeploystepfactory.cpp
@@ -58,6 +58,9 @@ QList<Core::Id> AndroidDeployStepFactory::availableCreationIds(BuildStepList *pa
         return QList<Core::Id>();
     if (parent->contains(AndroidDeployStep::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;
 }
 
diff --git a/src/plugins/android/androidpackagecreationfactory.cpp b/src/plugins/android/androidpackagecreationfactory.cpp
index 2bc7e7460f..6d19e081aa 100644
--- a/src/plugins/android/androidpackagecreationfactory.cpp
+++ b/src/plugins/android/androidpackagecreationfactory.cpp
@@ -36,6 +36,8 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 
+#include <qtsupport/qtkitinformation.h>
+
 using namespace ProjectExplorer;
 
 namespace Android {
@@ -54,6 +56,9 @@ QList<Core::Id> AndroidPackageCreationFactory::availableCreationIds(BuildStepLis
         return QList<Core::Id>();
     if (parent->contains(AndroidPackageCreationStep::CreatePackageId))
         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;
 }
 
-- 
GitLab