feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Restrict deployment factories to targets with the right qt

Browse Source 
Change-Id: I753023550f76b8b1b56fbdcd5176bcfa855e66bc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-10-09 17:16:01 +02:00
parent 713e4dd5e3
commit cf69783c0f
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -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;
} }

3
src/plugins/android/androiddeploystepfactory.cpp
View File

@@ -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;
} }

5
src/plugins/android/androidpackagecreationfactory.cpp
View File

@@ -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
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;
} }