forked from qt-creator/qt-creator
Move qmake specific part to qmake plugin, generalize android support
- Split up androiddeployqt into two steps: One building the apk, and one deploying it to the device. - The build apk step base class AndroidBuildApkStep is ihneritaged by the qmake specific class QmakeAndroidBuildApkStep. - The deployment step is still called androiddeployqt - Move all qmake specific code to the qmakeprojectmanager plguin - Flip the depencency between the android and qmake plugin, now the qmake plugin depends on the android plugin, implementing a interface the android plugin provides. - Note: This removes the debug deployment for now. Change-Id: I1c386640159ed14b637668abde8eb3b9009ab803 Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
committed by
Daniel Teske
parent
4657ac7452
commit
64e5a543a8
@@ -32,7 +32,7 @@
|
||||
|
||||
#include <utils/environment.h>
|
||||
|
||||
#include <projectexplorer/deployconfiguration.h>
|
||||
#include <projectexplorer/buildconfiguration.h>
|
||||
#include <projectexplorer/buildsteplist.h>
|
||||
|
||||
#define ASSERT_STATE_GENERIC(State, expected, actual) \
|
||||
@@ -45,15 +45,17 @@ class AndroidGlobal
|
||||
{
|
||||
public:
|
||||
|
||||
template<class T> static T *buildStep(const ProjectExplorer::DeployConfiguration *dc)
|
||||
template<class T> static T *buildStep(const ProjectExplorer::BuildConfiguration *dc)
|
||||
{
|
||||
ProjectExplorer::BuildStepList *bsl = dc->stepList();
|
||||
if (!bsl)
|
||||
return 0;
|
||||
const QList<ProjectExplorer::BuildStep *> &buildSteps = bsl->steps();
|
||||
for (int i = buildSteps.count() - 1; i >= 0; --i) {
|
||||
if (T * const step = qobject_cast<T *>(buildSteps.at(i)))
|
||||
return step;
|
||||
for (const Core::Id &id : dc->knownStepLists()) {
|
||||
ProjectExplorer::BuildStepList *bsl = dc->stepList(id);
|
||||
if (!bsl)
|
||||
return 0;
|
||||
const QList<ProjectExplorer::BuildStep *> &buildSteps = bsl->steps();
|
||||
for (int i = buildSteps.count() - 1; i >= 0; --i) {
|
||||
if (T * const step = qobject_cast<T *>(buildSteps.at(i)))
|
||||
return step;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user