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
				
			@@ -29,15 +29,15 @@
 | 
			
		||||
 | 
			
		||||
#include "androiddeployconfiguration.h"
 | 
			
		||||
#include "androidconstants.h"
 | 
			
		||||
#include "androidpackageinstallationstep.h"
 | 
			
		||||
#include "androiddeployqtstep.h"
 | 
			
		||||
#include "androidmanager.h"
 | 
			
		||||
#include "androidqtsupport.h"
 | 
			
		||||
 | 
			
		||||
#include <projectexplorer/buildsteplist.h>
 | 
			
		||||
#include <projectexplorer/project.h>
 | 
			
		||||
#include <projectexplorer/target.h>
 | 
			
		||||
#include <projectexplorer/toolchain.h>
 | 
			
		||||
 | 
			
		||||
#include <qmakeprojectmanager/qmakeproject.h>
 | 
			
		||||
#include <qtsupport/qtkitinformation.h>
 | 
			
		||||
#include <qtsupport/qtsupportconstants.h>
 | 
			
		||||
 | 
			
		||||
@@ -73,9 +73,7 @@ bool AndroidDeployConfigurationFactory::canCreate(Target *parent, Core::Id id) c
 | 
			
		||||
DeployConfiguration *AndroidDeployConfigurationFactory::create(Target *parent, Core::Id id)
 | 
			
		||||
{
 | 
			
		||||
    AndroidDeployConfiguration *dc = new AndroidDeployConfiguration(parent, id);
 | 
			
		||||
 | 
			
		||||
    dc->stepList()->insertStep(0, new AndroidPackageInstallationStep(AndroidPackageInstallationStep::BuildDirectory, dc->stepList()));
 | 
			
		||||
    dc->stepList()->insertStep(1, new AndroidDeployQtStep(dc->stepList()));
 | 
			
		||||
    dc->stepList()->insertStep(0, new AndroidDeployQtStep(dc->stepList()));
 | 
			
		||||
    return dc;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -114,9 +112,6 @@ DeployConfiguration *AndroidDeployConfigurationFactory::clone(Target *parent, De
 | 
			
		||||
QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(Target *parent) const
 | 
			
		||||
{
 | 
			
		||||
    QList<Core::Id> ids;
 | 
			
		||||
    if (!qobject_cast<QmakeProjectManager::QmakeProject *>(parent->project()))
 | 
			
		||||
        return ids;
 | 
			
		||||
 | 
			
		||||
    if (!parent->project()->supportsKit(parent->kit()))
 | 
			
		||||
        return ids;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user