Fix the imports structure for AndroidHEADmaster

Change-Id: I9bfa6783fa6b25ad80f3388f7b5b447b2024e724
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

35 files changed, 25 insertions, 22 deletions

diff --git a/src/imports/android/android.pro b/src/imports/android/android.pro
index bb9c75d..1cdf6bc 100644
--- a/src/imports/android/android.pro
+++ b/src/imports/android/android.pro
@@ -1,11 +1,13 @@
-TARGET = qtqmlandroidplugin
-TARGETPATH = android
-IMPORT_VERSION = 0.21
-
-QT += nativeandroid-private
-
-SOURCES += \
-    $$PWD/qtqmlandroidplugin.cpp
-
-CONFIG += no_cxx_module
-load(qml_plugin)
+TEMPLATE = subdirs
+SUBDIRS += \
+    android \
+    app \
+    content \
+    graphics \
+    graphics/drawable \
+    support/v4/widget \
+    support/v7/app \
+    support/v7/widget \
+    view \
+    view/animation \
+    widget
diff --git a/src/imports/android/android/android.pro b/src/imports/android/android/android.pro
new file mode 100644
index 0000000..bb9c75d
--- /dev/null
+++ b/src/imports/android/android/android.pro
@@ -0,0 +1,11 @@
+TARGET = qtqmlandroidplugin
+TARGETPATH = android
+IMPORT_VERSION = 0.21
+
+QT += nativeandroid-private
+
+SOURCES += \
+    $$PWD/qtqmlandroidplugin.cpp
+
+CONFIG += no_cxx_module
+load(qml_plugin)
diff --git a/src/imports/android/qmldir b/src/imports/android/android/qmldir
index 407a419..407a419 100644
--- a/src/imports/android/qmldir
+++ b/src/imports/android/android/qmldir
diff --git a/src/imports/android/qtqmlandroidplugin.cpp b/src/imports/android/android/qtqmlandroidplugin.cpp
index 383eef5..383eef5 100644
--- a/src/imports/android/qtqmlandroidplugin.cpp
+++ b/src/imports/android/android/qtqmlandroidplugin.cpp
diff --git a/src/imports/app/app.pro b/src/imports/android/app/app.pro
index 99a9e6a..99a9e6a 100644
--- a/src/imports/app/app.pro
+++ b/src/imports/android/app/app.pro
diff --git a/src/imports/app/qmldir b/src/imports/android/app/qmldir
index e58d55b..e58d55b 100644
--- a/src/imports/app/qmldir
+++ b/src/imports/android/app/qmldir
diff --git a/src/imports/app/qtqmlandroidappplugin.cpp b/src/imports/android/app/qtqmlandroidappplugin.cpp
index a430188..a430188 100644
--- a/src/imports/app/qtqmlandroidappplugin.cpp
+++ b/src/imports/android/app/qtqmlandroidappplugin.cpp
diff --git a/src/imports/content/content.pro b/src/imports/android/content/content.pro
index cb83204..cb83204 100644
--- a/src/imports/content/content.pro
+++ b/src/imports/android/content/content.pro
diff --git a/src/imports/content/qmldir b/src/imports/android/content/qmldir
index bd2252d..bd2252d 100644
--- a/src/imports/content/qmldir
+++ b/src/imports/android/content/qmldir
diff --git a/src/imports/content/qtqmlandroidcontentplugin.cpp b/src/imports/android/content/qtqmlandroidcontentplugin.cpp
index 26cf3c3..26cf3c3 100644
--- a/src/imports/content/qtqmlandroidcontentplugin.cpp
+++ b/src/imports/android/content/qtqmlandroidcontentplugin.cpp
diff --git a/src/imports/graphics/drawable/drawable.pro b/src/imports/android/graphics/drawable/drawable.pro
index 5a20bc2..5a20bc2 100644
--- a/src/imports/graphics/drawable/drawable.pro
+++ b/src/imports/android/graphics/drawable/drawable.pro
diff --git a/src/imports/graphics/drawable/qmldir b/src/imports/android/graphics/drawable/qmldir
index 5a44e0a..5a44e0a 100644
--- a/src/imports/graphics/drawable/qmldir
+++ b/src/imports/android/graphics/drawable/qmldir
diff --git a/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp b/src/imports/android/graphics/drawable/qtqmlandroiddrawableplugin.cpp
index 020b048..020b048 100644
--- a/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp
+++ b/src/imports/android/graphics/drawable/qtqmlandroiddrawableplugin.cpp
diff --git a/src/imports/graphics/graphics.pro b/src/imports/android/graphics/graphics.pro
index d08a732..d08a732 100644
--- a/src/imports/graphics/graphics.pro
+++ b/src/imports/android/graphics/graphics.pro
diff --git a/src/imports/graphics/qmldir b/src/imports/android/graphics/qmldir
index 5747f14..5747f14 100644
--- a/src/imports/graphics/qmldir
+++ b/src/imports/android/graphics/qmldir
diff --git a/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp b/src/imports/android/graphics/qtqmlandroidgraphicsplugin.cpp
index 4cfc6f4..4cfc6f4 100644
--- a/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp
+++ b/src/imports/android/graphics/qtqmlandroidgraphicsplugin.cpp
diff --git a/src/imports/support/v4/widget/qmldir b/src/imports/android/support/v4/widget/qmldir
index d497263..d497263 100644
--- a/src/imports/support/v4/widget/qmldir
+++ b/src/imports/android/support/v4/widget/qmldir
diff --git a/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp b/src/imports/android/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp
index 9096620..9096620 100644
--- a/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp
+++ b/src/imports/android/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp
diff --git a/src/imports/support/v4/widget/widget.pro b/src/imports/android/support/v4/widget/widget.pro
index 65c9283..65c9283 100644
--- a/src/imports/support/v4/widget/widget.pro
+++ b/src/imports/android/support/v4/widget/widget.pro
diff --git a/src/imports/support/v7/app/app.pro b/src/imports/android/support/v7/app/app.pro
index 056346b..056346b 100644
--- a/src/imports/support/v7/app/app.pro
+++ b/src/imports/android/support/v7/app/app.pro
diff --git a/src/imports/support/v7/app/qmldir b/src/imports/android/support/v7/app/qmldir
index 3849559..3849559 100644
--- a/src/imports/support/v7/app/qmldir
+++ b/src/imports/android/support/v7/app/qmldir
diff --git a/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp b/src/imports/android/support/v7/app/qtqmlandroidsupportv7appplugin.cpp
index c5aafbc..c5aafbc 100644
--- a/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp
+++ b/src/imports/android/support/v7/app/qtqmlandroidsupportv7appplugin.cpp
diff --git a/src/imports/support/v7/widget/qmldir b/src/imports/android/support/v7/widget/qmldir
index 9c5e173..9c5e173 100644
--- a/src/imports/support/v7/widget/qmldir
+++ b/src/imports/android/support/v7/widget/qmldir
diff --git a/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp b/src/imports/android/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp
index 63e988c..63e988c 100644
--- a/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp
+++ b/src/imports/android/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp
diff --git a/src/imports/support/v7/widget/widget.pro b/src/imports/android/support/v7/widget/widget.pro
index a150e0e..a150e0e 100644
--- a/src/imports/support/v7/widget/widget.pro
+++ b/src/imports/android/support/v7/widget/widget.pro
diff --git a/src/imports/view/animation/animation.pro b/src/imports/android/view/animation/animation.pro
index ab5252f..ab5252f 100644
--- a/src/imports/view/animation/animation.pro
+++ b/src/imports/android/view/animation/animation.pro
diff --git a/src/imports/view/animation/qmldir b/src/imports/android/view/animation/qmldir
index 22e1c3b..22e1c3b 100644
--- a/src/imports/view/animation/qmldir
+++ b/src/imports/android/view/animation/qmldir
diff --git a/src/imports/view/animation/qtqmlandroidanimationplugin.cpp b/src/imports/android/view/animation/qtqmlandroidanimationplugin.cpp
index 747be40..747be40 100644
--- a/src/imports/view/animation/qtqmlandroidanimationplugin.cpp
+++ b/src/imports/android/view/animation/qtqmlandroidanimationplugin.cpp
diff --git a/src/imports/view/qmldir b/src/imports/android/view/qmldir
index b75619f..b75619f 100644
--- a/src/imports/view/qmldir
+++ b/src/imports/android/view/qmldir
diff --git a/src/imports/view/qtqmlandroidviewplugin.cpp b/src/imports/android/view/qtqmlandroidviewplugin.cpp
index 17851de..17851de 100644
--- a/src/imports/view/qtqmlandroidviewplugin.cpp
+++ b/src/imports/android/view/qtqmlandroidviewplugin.cpp
diff --git a/src/imports/view/view.pro b/src/imports/android/view/view.pro
index 1cbddf2..1cbddf2 100644
--- a/src/imports/view/view.pro
+++ b/src/imports/android/view/view.pro
diff --git a/src/imports/widget/qmldir b/src/imports/android/widget/qmldir
index e360e78..e360e78 100644
--- a/src/imports/widget/qmldir
+++ b/src/imports/android/widget/qmldir
diff --git a/src/imports/widget/qtqmlandroidwidgetplugin.cpp b/src/imports/android/widget/qtqmlandroidwidgetplugin.cpp
index 0d31fc0..0d31fc0 100644
--- a/src/imports/widget/qtqmlandroidwidgetplugin.cpp
+++ b/src/imports/android/widget/qtqmlandroidwidgetplugin.cpp
diff --git a/src/imports/widget/widget.pro b/src/imports/android/widget/widget.pro
index 25dec8d..25dec8d 100644
--- a/src/imports/widget/widget.pro
+++ b/src/imports/android/widget/widget.pro
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 1cdf6bc..8b27cf1 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,13 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    android \
-    app \
-    content \
-    graphics \
-    graphics/drawable \
-    support/v4/widget \
-    support/v7/app \
-    support/v7/widget \
-    view \
-    view/animation \
-    widget
+    android