Android: Move CreateAndroidManifestWizard and related build step to base

It does not directly depend on qmake anymore.

Change-Id: I3b9625e54d98c79ef137059cf4554b3f2807e88e
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/android/androidbuildapkwidget.h b/src/plugins/android/androidbuildapkwidget.h
index 9559aade3b..47946298d2 100644
--- a/src/plugins/android/androidbuildapkwidget.h
+++ b/src/plugins/android/androidbuildapkwidget.h
@@ -42,10 +42,9 @@ namespace Ui { class AndroidBuildApkWidget; }
 QT_END_NAMESPACE
 
 namespace Android {
+namespace Internal {
 
-class AndroidBuildApkStep;
-
-class ANDROID_EXPORT AndroidBuildApkInnerWidget : public ProjectExplorer::BuildStepConfigWidget
+class AndroidBuildApkInnerWidget : public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
 
@@ -72,12 +71,12 @@ private:
     AndroidBuildApkStep *m_step;
 };
 
-class ANDROID_EXPORT AndroidBuildApkWidget : public ProjectExplorer::BuildStepConfigWidget
+class AndroidBuildApkWidget : public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
 
 public:
-    explicit AndroidBuildApkWidget(Android::AndroidBuildApkStep *step);
+    explicit AndroidBuildApkWidget(AndroidBuildApkStep *step);
 
 signals:
     void requestAndroidTemplates();
@@ -94,9 +93,10 @@ private:
     QListView *m_androidExtraLibsListView = nullptr;
     QToolButton *m_removeAndroidExtraLibButton = nullptr;
 
-    Android::AndroidBuildApkStep *m_step = nullptr;
+    AndroidBuildApkStep *m_step = nullptr;
     Android::AndroidExtraLibraryListModel *m_extraLibraryListModel = nullptr;
     bool m_ignoreChange = false;
 };
 
+} // namespace Internal
 } // namespace Android