Sort out install/copy rules for the .prf and .java files

NOTE: We must NOT install the .java files to

    $$[QT_INSTALL_PREFIX]/src/android/java/src

because the whole tree is copied into the android-build dir
and unconditionally compiled during application packaging.
Thus, we use $$[QT_INSTALL_PREFIX]/src/android/java/qml as
an installation location so that we can conditionally copy
the desired .java files to the application build directory.

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

22 files changed, 33 insertions, 33 deletions

diff --git a/features/qmlandroid.prf b/features/qmlandroid.prf
index fb0971b..7d5b3da 100644
--- a/features/qmlandroid.prf
+++ b/features/qmlandroid.prf
@@ -1,12 +1,12 @@
 isEmpty(QMLANDROID_PREFIX): \
     QMLANDROID_PREFIX = $$[QT_INSTALL_PREFIX]
 
-pkg_paths = $$files($$QMLANDROID_PREFIX/src/java/qt/android/*)
+pkg_paths = $$files($$QMLANDROID_PREFIX/src/android/java/qml/qt/android/*)
 for(pp, pkg_paths): \
     pkg_names += $$basename(pp)
 
 for(pkg, QMLANDROID_PACKAGES) {
-    pkg_path = $$QMLANDROID_PREFIX/src/java/qt/android/$$pkg
+    pkg_path = $$QMLANDROID_PREFIX/src/android/java/qml/qt/android/$$pkg
     !exists($$pkg_path): \
         error("Unknown QML for Android package '$$pkg'. Available packages: $$pkg_names")
     QMLANDROID_INPUT += $$pkg_path
diff --git a/qtqmlandroid.pro b/qtqmlandroid.pro
index 1a9d7b8..8e5a9e2 100644
--- a/qtqmlandroid.pro
+++ b/qtqmlandroid.pro
@@ -1,7 +1,3 @@
 requires(qtHaveModule(qml))
 requires(qtHaveModule(androidextras))
 load(qt_parts)
-
-features.files = $$PWD/features/qmlandroid.prf
-features.path = $$[QT_HOST_DATA]/mkspecs/features
-INSTALLS += features
diff --git a/src/android/android.pro b/src/android/android.pro
new file mode 100644
index 0000000..5221a4c
--- /dev/null
+++ b/src/android/android.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS += \
+    java
diff --git a/src/android/java/java.pro b/src/android/java/java.pro
new file mode 100644
index 0000000..9eaf2ae
--- /dev/null
+++ b/src/android/java/java.pro
@@ -0,0 +1,22 @@
+CONFIG -= qt android_install
+
+OTHER_FILES += \
+    $$PWD/qml/qt/android/app/QmlActivity.java \
+    $$PWD/qml/qt/android/app/QmlService.java \
+    $$PWD/qml/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java \
+    $$PWD/qml/qt/android/support/v7/widget/QmlRecyclerAdapter.java \
+    $$PWD/qml/qt/android/view/QmlMenu.java \
+    $$PWD/qml/qt/android/view/QmlMenuItem.java \
+    $$PWD/qml/qt/android/view/QmlViewListener.java \
+    $$PWD/qml/qt/android/widget/QmlCompoundButtonListener.java \
+    $$PWD/qml/qt/android/widget/QmlNumberPickerListener.java \
+    $$PWD/qml/qt/android/widget/QmlRadioGroupListener.java \
+    $$PWD/qml/qt/android/widget/QmlRatingBarListener.java \
+    $$PWD/qml/qt/android/widget/QmlScrollView.java \
+    $$PWD/qml/qt/android/widget/QmlSeekBarListener.java \
+    $$PWD/qml/qt/android/widget/QmlTabHostListener.java
+
+java.files = $$PWD/qml
+java.path = $$[QT_INSTALL_PREFIX]/src/android/java
+!prefix_build: COPIES += java
+INSTALLS += java
diff --git a/src/java/qt/android/app/QmlActivity.java b/src/android/java/qml/qt/android/app/QmlActivity.java
index 21666b4..21666b4 100644
--- a/src/java/qt/android/app/QmlActivity.java
+++ b/src/android/java/qml/qt/android/app/QmlActivity.java
diff --git a/src/java/qt/android/app/QmlService.java b/src/android/java/qml/qt/android/app/QmlService.java
index 16203ce..16203ce 100644
--- a/src/java/qt/android/app/QmlService.java
+++ b/src/android/java/qml/qt/android/app/QmlService.java
diff --git a/src/java/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java b/src/android/java/qml/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java
index 208413e..208413e 100644
--- a/src/java/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java
+++ b/src/android/java/qml/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java
diff --git a/src/java/qt/android/support/v7/widget/QmlRecyclerAdapter.java b/src/android/java/qml/qt/android/support/v7/widget/QmlRecyclerAdapter.java
index fcf015d..fcf015d 100644
--- a/src/java/qt/android/support/v7/widget/QmlRecyclerAdapter.java
+++ b/src/android/java/qml/qt/android/support/v7/widget/QmlRecyclerAdapter.java
diff --git a/src/java/qt/android/view/QmlMenu.java b/src/android/java/qml/qt/android/view/QmlMenu.java
index 43a195e..43a195e 100644
--- a/src/java/qt/android/view/QmlMenu.java
+++ b/src/android/java/qml/qt/android/view/QmlMenu.java
diff --git a/src/java/qt/android/view/QmlMenuItem.java b/src/android/java/qml/qt/android/view/QmlMenuItem.java
index fbd9b36..fbd9b36 100644
--- a/src/java/qt/android/view/QmlMenuItem.java
+++ b/src/android/java/qml/qt/android/view/QmlMenuItem.java
diff --git a/src/java/qt/android/view/QmlViewListener.java b/src/android/java/qml/qt/android/view/QmlViewListener.java
index 941e4bf..941e4bf 100644
--- a/src/java/qt/android/view/QmlViewListener.java
+++ b/src/android/java/qml/qt/android/view/QmlViewListener.java
diff --git a/src/java/qt/android/widget/QmlAdapterViewListener.java b/src/android/java/qml/qt/android/widget/QmlAdapterViewListener.java
index 0b9720d..0b9720d 100644
--- a/src/java/qt/android/widget/QmlAdapterViewListener.java
+++ b/src/android/java/qml/qt/android/widget/QmlAdapterViewListener.java
diff --git a/src/java/qt/android/widget/QmlCompoundButtonListener.java b/src/android/java/qml/qt/android/widget/QmlCompoundButtonListener.java
index 2c30531..2c30531 100644
--- a/src/java/qt/android/widget/QmlCompoundButtonListener.java
+++ b/src/android/java/qml/qt/android/widget/QmlCompoundButtonListener.java
diff --git a/src/java/qt/android/widget/QmlNumberPickerListener.java b/src/android/java/qml/qt/android/widget/QmlNumberPickerListener.java
index 681c059..681c059 100644
--- a/src/java/qt/android/widget/QmlNumberPickerListener.java
+++ b/src/android/java/qml/qt/android/widget/QmlNumberPickerListener.java
diff --git a/src/java/qt/android/widget/QmlRadioGroupListener.java b/src/android/java/qml/qt/android/widget/QmlRadioGroupListener.java
index c605a33..c605a33 100644
--- a/src/java/qt/android/widget/QmlRadioGroupListener.java
+++ b/src/android/java/qml/qt/android/widget/QmlRadioGroupListener.java
diff --git a/src/java/qt/android/widget/QmlRatingBarListener.java b/src/android/java/qml/qt/android/widget/QmlRatingBarListener.java
index 5c8705f..5c8705f 100644
--- a/src/java/qt/android/widget/QmlRatingBarListener.java
+++ b/src/android/java/qml/qt/android/widget/QmlRatingBarListener.java
diff --git a/src/java/qt/android/widget/QmlScrollView.java b/src/android/java/qml/qt/android/widget/QmlScrollView.java
index 7b0f19c..7b0f19c 100644
--- a/src/java/qt/android/widget/QmlScrollView.java
+++ b/src/android/java/qml/qt/android/widget/QmlScrollView.java
diff --git a/src/java/qt/android/widget/QmlSeekBarListener.java b/src/android/java/qml/qt/android/widget/QmlSeekBarListener.java
index 45cf130..45cf130 100644
--- a/src/java/qt/android/widget/QmlSeekBarListener.java
+++ b/src/android/java/qml/qt/android/widget/QmlSeekBarListener.java
diff --git a/src/java/qt/android/widget/QmlTabHostListener.java b/src/android/java/qml/qt/android/widget/QmlTabHostListener.java
index ef2b1f1..ef2b1f1 100644
--- a/src/java/qt/android/widget/QmlTabHostListener.java
+++ b/src/android/java/qml/qt/android/widget/QmlTabHostListener.java
diff --git a/src/java/java.pro b/src/java/java.pro
deleted file mode 100644
index 2fddabc..0000000
--- a/src/java/java.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-CONFIG -= qt android_install
-
-OTHER_FILES += \
-    $$PWD/qt/android/app/QmlActivity.java \
-    $$PWD/qt/android/app/QmlService.java \
-    $$PWD/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java \
-    $$PWD/qt/android/support/v7/widget/QmlRecyclerAdapter.java \
-    $$PWD/qt/android/view/QmlMenu.java \
-    $$PWD/qt/android/view/QmlMenuItem.java \
-    $$PWD/qt/android/view/QmlViewListener.java \
-    $$PWD/qt/android/widget/QmlCompoundButtonListener.java \
-    $$PWD/qt/android/widget/QmlNumberPickerListener.java \
-    $$PWD/qt/android/widget/QmlRadioGroupListener.java \
-    $$PWD/qt/android/widget/QmlRatingBarListener.java \
-    $$PWD/qt/android/widget/QmlScrollView.java \
-    $$PWD/qt/android/widget/QmlSeekBarListener.java \
-    $$PWD/qt/android/widget/QmlTabHostListener.java
-
-java.files = $$PWD/qt
-java.path = $$[QT_INSTALL_PREFIX]/src/java
-INSTALLS += java
-
-contains(QT_CONFIG, private_tests) {   # -developer-build
-    QMAKE_POST_LINK += \
-        $${QMAKE_COPY_DIR} $$shell_path($$PWD/qt) $$shell_path($$java.path)
-}
diff --git a/src/qmlandroid/qmlandroid.pro b/src/qmlandroid/qmlandroid.pro
index 56b2ff4..8f5c2ab 100644
--- a/src/qmlandroid/qmlandroid.pro
+++ b/src/qmlandroid/qmlandroid.pro
@@ -6,6 +6,11 @@ QT += core-private # qjnihelpers
 CONFIG += c++11
 CONFIG -= create_cmake
 
+features.files = $$QMLANDROID_PREFIX/features/qmlandroid.prf
+features.path = $$[QT_HOST_DATA]/mkspecs/features
+!prefix_build: COPIES += features
+INSTALLS += features
+
 include(qmlandroid.pri)
 
 load(qt_module)
diff --git a/src/src.pro b/src/src.pro
index 39d8dce..1308d42 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,6 +2,6 @@ TEMPLATE = subdirs
 SUBDIRS += \
     qmlandroid \
     imports \
-    java
+    android
 
 imports.depends = qmlandroid