Move .java files

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

18 files changed, 18 insertions, 17 deletions

diff --git a/features/qmlandroid.prf b/features/qmlandroid.prf
index 7d5b3da..1cc94dd 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/android/java/qml/qt/android/*)
+pkg_paths = $$files($$QMLANDROID_PREFIX/src/android/java/native/qt/android/*)
 for(pp, pkg_paths): \
     pkg_names += $$basename(pp)
 
 for(pkg, QMLANDROID_PACKAGES) {
-    pkg_path = $$QMLANDROID_PREFIX/src/android/java/qml/qt/android/$$pkg
+    pkg_path = $$QMLANDROID_PREFIX/src/android/java/native/qt/android/$$pkg
     !exists($$pkg_path): \
         error("Unknown QML for Android package '$$pkg'. Available packages: $$pkg_names")
     QMLANDROID_INPUT += $$pkg_path
diff --git a/src/android/android.pro b/src/android/android.pro
index e362b65..f8d7db4 100644
--- a/src/android/android.pro
+++ b/src/android/android.pro
@@ -12,5 +12,6 @@ features.path = $$[QT_HOST_DATA]/mkspecs/features
 INSTALLS += features
 
 include(android.pri)
+include(java/java.pri)
 
 load(qt_module)
diff --git a/src/android/java/java.pri b/src/android/java/java.pri
index 73ba60d..8ae10ef 100644
--- a/src/android/java/java.pri
+++ b/src/android/java/java.pri
@@ -1,20 +1,20 @@
 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
+    $$PWD/native/qt/android/app/QmlActivity.java \
+    $$PWD/native/qt/android/app/QmlService.java \
+    $$PWD/native/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java \
+    $$PWD/native/qt/android/support/v7/widget/QmlRecyclerAdapter.java \
+    $$PWD/native/qt/android/view/QmlMenu.java \
+    $$PWD/native/qt/android/view/QmlMenuItem.java \
+    $$PWD/native/qt/android/view/QmlViewListener.java \
+    $$PWD/native/qt/android/widget/QmlCompoundButtonListener.java \
+    $$PWD/native/qt/android/widget/QmlNumberPickerListener.java \
+    $$PWD/native/qt/android/widget/QmlRadioGroupListener.java \
+    $$PWD/native/qt/android/widget/QmlRatingBarListener.java \
+    $$PWD/native/qt/android/widget/QmlScrollView.java \
+    $$PWD/native/qt/android/widget/QmlSeekBarListener.java \
+    $$PWD/natiev/qt/android/widget/QmlTabHostListener.java
 
-java.files = $$PWD/qml
+java.files = $$PWD/native
 java.path = $$[QT_INSTALL_PREFIX]/src/android/java
 !prefix_build: COPIES += java
 INSTALLS += java
diff --git a/src/android/java/qml/qt/android/app/QmlActivity.java b/src/android/java/native/qt/android/app/QmlActivity.java
index 21666b4..21666b4 100644
--- a/src/android/java/qml/qt/android/app/QmlActivity.java
+++ b/src/android/java/native/qt/android/app/QmlActivity.java
diff --git a/src/android/java/qml/qt/android/app/QmlService.java b/src/android/java/native/qt/android/app/QmlService.java
index 16203ce..16203ce 100644
--- a/src/android/java/qml/qt/android/app/QmlService.java
+++ b/src/android/java/native/qt/android/app/QmlService.java
diff --git a/src/android/java/qml/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java b/src/android/java/native/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java
index 208413e..208413e 100644
--- a/src/android/java/qml/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java
+++ b/src/android/java/native/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java
diff --git a/src/android/java/qml/qt/android/support/v7/widget/QmlRecyclerAdapter.java b/src/android/java/native/qt/android/support/v7/widget/QmlRecyclerAdapter.java
index fcf015d..fcf015d 100644
--- a/src/android/java/qml/qt/android/support/v7/widget/QmlRecyclerAdapter.java
+++ b/src/android/java/native/qt/android/support/v7/widget/QmlRecyclerAdapter.java
diff --git a/src/android/java/qml/qt/android/view/QmlMenu.java b/src/android/java/native/qt/android/view/QmlMenu.java
index 43a195e..43a195e 100644
--- a/src/android/java/qml/qt/android/view/QmlMenu.java
+++ b/src/android/java/native/qt/android/view/QmlMenu.java
diff --git a/src/android/java/qml/qt/android/view/QmlMenuItem.java b/src/android/java/native/qt/android/view/QmlMenuItem.java
index fbd9b36..fbd9b36 100644
--- a/src/android/java/qml/qt/android/view/QmlMenuItem.java
+++ b/src/android/java/native/qt/android/view/QmlMenuItem.java
diff --git a/src/android/java/qml/qt/android/view/QmlViewListener.java b/src/android/java/native/qt/android/view/QmlViewListener.java
index 941e4bf..941e4bf 100644
--- a/src/android/java/qml/qt/android/view/QmlViewListener.java
+++ b/src/android/java/native/qt/android/view/QmlViewListener.java
diff --git a/src/android/java/qml/qt/android/widget/QmlAdapterViewListener.java b/src/android/java/native/qt/android/widget/QmlAdapterViewListener.java
index 0b9720d..0b9720d 100644
--- a/src/android/java/qml/qt/android/widget/QmlAdapterViewListener.java
+++ b/src/android/java/native/qt/android/widget/QmlAdapterViewListener.java
diff --git a/src/android/java/qml/qt/android/widget/QmlCompoundButtonListener.java b/src/android/java/native/qt/android/widget/QmlCompoundButtonListener.java
index 2c30531..2c30531 100644
--- a/src/android/java/qml/qt/android/widget/QmlCompoundButtonListener.java
+++ b/src/android/java/native/qt/android/widget/QmlCompoundButtonListener.java
diff --git a/src/android/java/qml/qt/android/widget/QmlNumberPickerListener.java b/src/android/java/native/qt/android/widget/QmlNumberPickerListener.java
index 681c059..681c059 100644
--- a/src/android/java/qml/qt/android/widget/QmlNumberPickerListener.java
+++ b/src/android/java/native/qt/android/widget/QmlNumberPickerListener.java
diff --git a/src/android/java/qml/qt/android/widget/QmlRadioGroupListener.java b/src/android/java/native/qt/android/widget/QmlRadioGroupListener.java
index c605a33..c605a33 100644
--- a/src/android/java/qml/qt/android/widget/QmlRadioGroupListener.java
+++ b/src/android/java/native/qt/android/widget/QmlRadioGroupListener.java
diff --git a/src/android/java/qml/qt/android/widget/QmlRatingBarListener.java b/src/android/java/native/qt/android/widget/QmlRatingBarListener.java
index 5c8705f..5c8705f 100644
--- a/src/android/java/qml/qt/android/widget/QmlRatingBarListener.java
+++ b/src/android/java/native/qt/android/widget/QmlRatingBarListener.java
diff --git a/src/android/java/qml/qt/android/widget/QmlScrollView.java b/src/android/java/native/qt/android/widget/QmlScrollView.java
index 7b0f19c..7b0f19c 100644
--- a/src/android/java/qml/qt/android/widget/QmlScrollView.java
+++ b/src/android/java/native/qt/android/widget/QmlScrollView.java
diff --git a/src/android/java/qml/qt/android/widget/QmlSeekBarListener.java b/src/android/java/native/qt/android/widget/QmlSeekBarListener.java
index 45cf130..45cf130 100644
--- a/src/android/java/qml/qt/android/widget/QmlSeekBarListener.java
+++ b/src/android/java/native/qt/android/widget/QmlSeekBarListener.java
diff --git a/src/android/java/qml/qt/android/widget/QmlTabHostListener.java b/src/android/java/native/qt/android/widget/QmlTabHostListener.java
index ef2b1f1..ef2b1f1 100644
--- a/src/android/java/qml/qt/android/widget/QmlTabHostListener.java
+++ b/src/android/java/native/qt/android/widget/QmlTabHostListener.java