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>

1 files changed, 0 insertions, 80 deletions

diff --git a/src/plugins/android/androidpackageinstallationstep.h b/src/plugins/android/androidpackageinstallationstep.h
deleted file mode 100644
index dd61729925..0000000000
--- a/src/plugins/android/androidpackageinstallationstep.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************
-**
-** Copyright (c) 2014 BogDan Vatra <bog_dan_ro@yahoo.com>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef ANDROIDPACKAGEINSTALLATIONSTEP_H
-#define ANDROIDPACKAGEINSTALLATIONSTEP_H
-
-#include <projectexplorer/buildstep.h>
-#include <projectexplorer/abstractprocessstep.h>
-
-namespace Android {
-namespace Internal {
-
-class AndroidPackageInstallationStep : public ProjectExplorer::AbstractProcessStep
-{
-    Q_OBJECT
-    friend class AndroidPackageInstallationFactory;
-
-public:
-    enum AndroidDirectory { ProjectDirectory, BuildDirectory };
-    explicit AndroidPackageInstallationStep(AndroidDirectory mode, ProjectExplorer::BuildStepList *bsl);
-    bool init();
-
-    bool fromMap(const QVariantMap &map);
-    QVariantMap toMap() const;
-
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
-    bool immutable() const;
-
-    void run(QFutureInterface<bool> &fi);
-private:
-    AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc,
-        AndroidPackageInstallationStep *other);
-    AndroidDirectory m_androidDirectory;
-    QString m_androidDirToClean;
-    static const Core::Id Id;
-};
-
-class AndroidPackageInstallationStepWidget : public ProjectExplorer::BuildStepConfigWidget
-{
-    Q_OBJECT
-public:
-    AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step);
-
-    QString summaryText() const;
-    QString displayName() const;
-    bool showWidget() const;
-private:
-    AndroidPackageInstallationStep *m_step;
-};
-
-} // namespace Internal
-} // namespace Android
-
-#endif // ANDROIDPACKAGEINSTALLATIONSTEP_H