Deploy appropriate Java files

QT += qmlandroid
QMLANDROID_PACKAGES = app support view widget

Avoids the hard dependency to Android Support libraries.

Change-Id: Id5a48b0e8bd368485977dc232520b2fa90415cfa
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

16 files changed, 18 insertions, 19 deletions

diff --git a/src/java/java.pro b/src/java/java.pro
index 26a955e..96e2f05 100644
--- a/src/java/java.pro
+++ b/src/java/java.pro
@@ -1,27 +1,26 @@
 CONFIG -= qt android_install
 
 OTHER_FILES += \
-    $$PWD/src/qt/android/app/QtActivity.java \
-    $$PWD/src/qt/android/app/QtService.java \
-    $$PWD/src/qt/android/support/v4/widget/QtSwipeRefreshLayoutListener.java \
-    $$PWD/src/qt/android/support/v7/widget/QtRecyclerAdapter.java \
-    $$PWD/src/qt/android/view/QtMenu.java \
-    $$PWD/src/qt/android/view/QtMenuItem.java \
-    $$PWD/src/qt/android/view/QtViewListener.java \
-    $$PWD/src/qt/android/widget/QtCompoundButtonListener.java \
-    $$PWD/src/qt/android/widget/QtNumberPickerListener.java \
-    $$PWD/src/qt/android/widget/QtRadioGroupListener.java \
-    $$PWD/src/qt/android/widget/QtRatingBarListener.java \
-    $$PWD/src/qt/android/widget/QtScrollView.java \
-    $$PWD/src/qt/android/widget/QtSeekBarListener.java \
-    $$PWD/src/qt/android/widget/QtTabHostListener.java
+    $$PWD/qt/android/app/QtActivity.java \
+    $$PWD/qt/android/app/QtService.java \
+    $$PWD/qt/android/support/v4/widget/QtSwipeRefreshLayoutListener.java \
+    $$PWD/qt/android/support/v7/widget/QtRecyclerAdapter.java \
+    $$PWD/qt/android/view/QtMenu.java \
+    $$PWD/qt/android/view/QtMenuItem.java \
+    $$PWD/qt/android/view/QtViewListener.java \
+    $$PWD/qt/android/widget/QtCompoundButtonListener.java \
+    $$PWD/qt/android/widget/QtNumberPickerListener.java \
+    $$PWD/qt/android/widget/QtRadioGroupListener.java \
+    $$PWD/qt/android/widget/QtRatingBarListener.java \
+    $$PWD/qt/android/widget/QtScrollView.java \
+    $$PWD/qt/android/widget/QtSeekBarListener.java \
+    $$PWD/qt/android/widget/QtTabHostListener.java
 
-javaresources.files = $$PWD/src
-javaresources.path = $$[QT_INSTALL_PREFIX]/src/android/java
-
-INSTALLS += javaresources
+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/src) $$shell_path($$javaresources.path)
+        $${QMAKE_COPY_DIR} $$shell_path($$PWD/qt) $$shell_path($$java.path)
 }
diff --git a/src/java/src/qt/android/app/QtActivity.java b/src/java/qt/android/app/QtActivity.java
index 195be1b..195be1b 100644
--- a/src/java/src/qt/android/app/QtActivity.java
+++ b/src/java/qt/android/app/QtActivity.java
diff --git a/src/java/src/qt/android/app/QtService.java b/src/java/qt/android/app/QtService.java
index 7c844f3..7c844f3 100644
--- a/src/java/src/qt/android/app/QtService.java
+++ b/src/java/qt/android/app/QtService.java
diff --git a/src/java/src/qt/android/support/v4/widget/QtSwipeRefreshLayoutListener.java b/src/java/qt/android/support/v4/widget/QtSwipeRefreshLayoutListener.java
index 7edf311..7edf311 100644
--- a/src/java/src/qt/android/support/v4/widget/QtSwipeRefreshLayoutListener.java
+++ b/src/java/qt/android/support/v4/widget/QtSwipeRefreshLayoutListener.java
diff --git a/src/java/src/qt/android/support/v7/widget/QtRecyclerAdapter.java b/src/java/qt/android/support/v7/widget/QtRecyclerAdapter.java
index 98756f7..98756f7 100644
--- a/src/java/src/qt/android/support/v7/widget/QtRecyclerAdapter.java
+++ b/src/java/qt/android/support/v7/widget/QtRecyclerAdapter.java
diff --git a/src/java/src/qt/android/view/QtMenu.java b/src/java/qt/android/view/QtMenu.java
index fc17a46..fc17a46 100644
--- a/src/java/src/qt/android/view/QtMenu.java
+++ b/src/java/qt/android/view/QtMenu.java
diff --git a/src/java/src/qt/android/view/QtMenuItem.java b/src/java/qt/android/view/QtMenuItem.java
index c6ec53d..c6ec53d 100644
--- a/src/java/src/qt/android/view/QtMenuItem.java
+++ b/src/java/qt/android/view/QtMenuItem.java
diff --git a/src/java/src/qt/android/view/QtViewListener.java b/src/java/qt/android/view/QtViewListener.java
index 2b724e4..2b724e4 100644
--- a/src/java/src/qt/android/view/QtViewListener.java
+++ b/src/java/qt/android/view/QtViewListener.java
diff --git a/src/java/src/qt/android/widget/QtAdapterViewListener.java b/src/java/qt/android/widget/QtAdapterViewListener.java
index bb8a32f..bb8a32f 100644
--- a/src/java/src/qt/android/widget/QtAdapterViewListener.java
+++ b/src/java/qt/android/widget/QtAdapterViewListener.java
diff --git a/src/java/src/qt/android/widget/QtCompoundButtonListener.java b/src/java/qt/android/widget/QtCompoundButtonListener.java
index 3edcb9a..3edcb9a 100644
--- a/src/java/src/qt/android/widget/QtCompoundButtonListener.java
+++ b/src/java/qt/android/widget/QtCompoundButtonListener.java
diff --git a/src/java/src/qt/android/widget/QtNumberPickerListener.java b/src/java/qt/android/widget/QtNumberPickerListener.java
index 60eb026..60eb026 100644
--- a/src/java/src/qt/android/widget/QtNumberPickerListener.java
+++ b/src/java/qt/android/widget/QtNumberPickerListener.java
diff --git a/src/java/src/qt/android/widget/QtRadioGroupListener.java b/src/java/qt/android/widget/QtRadioGroupListener.java
index 9187571..9187571 100644
--- a/src/java/src/qt/android/widget/QtRadioGroupListener.java
+++ b/src/java/qt/android/widget/QtRadioGroupListener.java
diff --git a/src/java/src/qt/android/widget/QtRatingBarListener.java b/src/java/qt/android/widget/QtRatingBarListener.java
index 0fd1411..0fd1411 100644
--- a/src/java/src/qt/android/widget/QtRatingBarListener.java
+++ b/src/java/qt/android/widget/QtRatingBarListener.java
diff --git a/src/java/src/qt/android/widget/QtScrollView.java b/src/java/qt/android/widget/QtScrollView.java
index af6ccad..af6ccad 100644
--- a/src/java/src/qt/android/widget/QtScrollView.java
+++ b/src/java/qt/android/widget/QtScrollView.java
diff --git a/src/java/src/qt/android/widget/QtSeekBarListener.java b/src/java/qt/android/widget/QtSeekBarListener.java
index 0d789c4..0d789c4 100644
--- a/src/java/src/qt/android/widget/QtSeekBarListener.java
+++ b/src/java/qt/android/widget/QtSeekBarListener.java
diff --git a/src/java/src/qt/android/widget/QtTabHostListener.java b/src/java/qt/android/widget/QtTabHostListener.java
index 511a291..511a291 100644
--- a/src/java/src/qt/android/widget/QtTabHostListener.java
+++ b/src/java/qt/android/widget/QtTabHostListener.java