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
@@ -33,9 +33,10 @@
|
||||
#include <projectexplorer/devicesupport/idevice.h>
|
||||
|
||||
namespace Android {
|
||||
namespace Internal {
|
||||
class AndroidConfigurations; // needed for friend declaration
|
||||
|
||||
namespace Internal {
|
||||
|
||||
class AndroidDevice : public ProjectExplorer::IDevice
|
||||
{
|
||||
public:
|
||||
@@ -54,7 +55,7 @@ public:
|
||||
|
||||
protected:
|
||||
friend class AndroidDeviceFactory;
|
||||
friend class AndroidConfigurations;
|
||||
friend class Android::AndroidConfigurations;
|
||||
AndroidDevice();
|
||||
AndroidDevice(const AndroidDevice &other);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user