aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidruncontrol.h
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2014-06-25 15:42:11 +0200
committerDaniel Teske <daniel.teske@digia.com>2014-07-21 12:41:28 +0200
commit64e5a543a845d8d800504206a42c58d4e28ac89c (patch)
tree205faff83b9fb890c65309fe4c7cc7878826f515 /src/plugins/android/androidruncontrol.h
parent4657ac7452662d19823412e82d599bf4079a3c4d (diff)
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>
Diffstat (limited to 'src/plugins/android/androidruncontrol.h')
-rw-r--r--src/plugins/android/androidruncontrol.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/android/androidruncontrol.h b/src/plugins/android/androidruncontrol.h
index 2f6d87acdce..ab624b507dc 100644
--- a/src/plugins/android/androidruncontrol.h
+++ b/src/plugins/android/androidruncontrol.h
@@ -36,7 +36,6 @@ namespace Android {
class AndroidRunConfiguration;
namespace Internal {
-
class AndroidRunner;
class AndroidRunControl : public ProjectExplorer::RunControl