Android: Qt 5.2 deployment add a button to create a Android manifest

The AndroidManifest.xml is no longer needed in as many use cases as before. So the new deployment does not automatically create a android manifest. Offer a button on the deployment page to create a android manifest. This also edits the .pro file adding the ANDROID_PACKAGE_SOURCE_DIR. Change-Id: I2655dd6c96e2087732b4d7240b31fe9fcf168600 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-26 18:38:44 +02:00
parent 166a0dff4a
commit 64c17eab22
10 changed files with 467 additions and 59 deletions
--- a/src/plugins/android/createandroidmanifestwizard.h
+++ b/src/plugins/android/createandroidmanifestwizard.h
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** 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 CREATEANDROIDMANIFESTWIZARD_H
+#define CREATEANDROIDMANIFESTWIZARD_H
+
+#include <utils/pathchooser.h>
+#include <utils/wizard.h>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+QT_END_NAMESPACE
+
+namespace ProjectExplorer { class Target; }
+namespace Qt4ProjectManager { class Qt4ProFileNode; }
+
+namespace Android {
+namespace Internal {
+
+class CreateAndroidManifestWizard;
+
+class NoApplicationProFilePage : public QWizardPage
+{
+    Q_OBJECT
+public:
+    NoApplicationProFilePage(CreateAndroidManifestWizard *wizard);
+private:
+    CreateAndroidManifestWizard *m_wizard;
+};
+
+class ChooseProFilePage : public QWizardPage
+{
+    Q_OBJECT
+public:
+    ChooseProFilePage(CreateAndroidManifestWizard *wizard, const QList<Qt4ProjectManager::Qt4ProFileNode *> &nodes);
+private slots:
+    void nodeSelected(int index);
+private:
+    CreateAndroidManifestWizard *m_wizard;
+    QComboBox *m_comboBox;
+};
+
+class ChooseDirectoryPage : public QWizardPage
+{
+    Q_OBJECT
+public:
+    ChooseDirectoryPage(CreateAndroidManifestWizard *wizard);
+private:
+    CreateAndroidManifestWizard *m_wizard;
+    Utils::PathChooser *m_androidPackageSourceDir;
+};
+
+class CreateAndroidManifestWizard : public Utils::Wizard
+{
+    Q_OBJECT
+public:
+    CreateAndroidManifestWizard(ProjectExplorer::Target *target);
+
+    Qt4ProjectManager::Qt4ProFileNode *node() const;
+    void setNode(Qt4ProjectManager::Qt4ProFileNode *node);
+
+    QString sourceFileName() const;
+
+    void accept();
+
+public slots:
+    void setDirectory(const QString &directory);
+private:
+    void createAndroidManifestFile();
+    ProjectExplorer::Target *m_target;
+    Qt4ProjectManager::Qt4ProFileNode *m_node;
+    QString m_directory;
+};
+}
+}
+
+#endif // CREATEANDROIDMANIFESTWIZARD_H