Deploy the built-in Android modules by default

Only require explicitly enabling the support packages, which must
be also linked to in the gradle build script.

.pro:

    ANDROID_SUPPORT = v4 v7

build.gradle:

    dependencies {
        compile fileTree(dir: 'libs', include: ['*.jar'])
        compile 'com.android.support:appcompat-v7:21.0.+'
        compile 'com.android.support:cardview-v7:21.0.+'
        compile 'com.android.support:recyclerview-v7:21.0.+'
        compile 'com.android.support:support-v4:21.0.+'
    }

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

35 files changed, 71 insertions, 72 deletions

diff --git a/README b/README
index fbb4810..a4b48d3 100644
--- a/README
+++ b/README
@@ -25,7 +25,6 @@ Link to the library, and deploy the desired Android packages
 in the application .pro file:
 
     QT += qmlandroid
-    QMLANDROID_PACKAGES = app view widget
 
 A minimal QML example that can replace the main.qml when using
 the Qt Quick Application template in Qt Creator. The rest can
@@ -45,8 +44,8 @@ stay the same, using QQmlApplicationEngine to load the main.qml:
 Using an options menu in Activity requires changing the activity
 type in AndroidManifest.xml. The default activity type for Qt apps
 is "org.qtproject.qt5.android.bindings.QtActivity", which must be
-changed to "qt.android.app.QtNativeActivity". In order to create
-the file, click "Create Templates" in Qt Creator:
+changed to "org.qtproject.qt5.android.bindings.app.QtNativeActivity".
+In order to create the file, click "Create Templates" in Qt Creator:
 
     Projects -> Build & Run -> Build Steps -> Build Android APK
 
diff --git a/examples/qmlandroid/catalog/android/AndroidManifest.xml b/examples/qmlandroid/catalog/android/AndroidManifest.xml
index e203ab7..94433bd 100644
--- a/examples/qmlandroid/catalog/android/AndroidManifest.xml
+++ b/examples/qmlandroid/catalog/android/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:theme="@android:style/Theme.Material.Light.DarkActionBar">
-        <service android:name="qt.android.app.QtNativeService" />
+        <service android:name="org.qtproject.qt5.android.bindings.app.QtNativeService" />
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
-                  android:name="qt.android.app.QtNativeActivity"
+                  android:name="org.qtproject.qt5.android.bindings.app.QtNativeActivity"
                   android:label="-- %%INSERT_APP_NAME%% --"
                   android:screenOrientation="unspecified"
                   android:launchMode="singleTop">
diff --git a/examples/qmlandroid/catalog/catalog.pro b/examples/qmlandroid/catalog/catalog.pro
index 4e133d3..a79f092 100644
--- a/examples/qmlandroid/catalog/catalog.pro
+++ b/examples/qmlandroid/catalog/catalog.pro
@@ -22,7 +22,7 @@ DISTFILES += \
     android/gradle/wrapper/gradle-wrapper.properties
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
-QMLANDROID_PACKAGES = app support view widget
+ANDROID_SUPPORT = v4 v7
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qmlandroid/catalog
 INSTALLS += target
diff --git a/features/qmlandroid.prf b/features/qmlandroid.prf
index db67a1b..07b40f3 100644
--- a/features/qmlandroid.prf
+++ b/features/qmlandroid.prf
@@ -1,23 +1,23 @@
 isEmpty(QMLANDROID_PREFIX): \
     QMLANDROID_PREFIX = $$[QT_INSTALL_PREFIX]
 
-pkg_paths = $$files($$QMLANDROID_PREFIX/src/android/java/native/qt/android/*)
-for(pp, pkg_paths): \
-    pkg_names += $$basename(pp)
+support_pkg_paths = $$files($$QMLANDROID_PREFIX/src/android/java/support/*)
+for(path, support_pkg_paths): \
+    support_pkg_names += $$basename(path)
 
-for(pkg, QMLANDROID_PACKAGES) {
-    pkg_path = $$QMLANDROID_PREFIX/src/android/java/native/qt/android/$$pkg
+for(pkg, ANDROID_SUPPORT) {
+    pkg_path = $$QMLANDROID_PREFIX/src/android/java/support/$$pkg
     !exists($$pkg_path): \
-        error("Unknown QML for Android package '$$pkg'. Available packages: $$pkg_names")
-    QMLANDROID_INPUT += $$pkg_path
+        error("Unknown Android support package '$$pkg'. Available packages: $$pkg_names")
+    ANDROID_SUPPORT_INPUT += $$pkg_path
 }
 
-QMLANDROID_OUTPUT = $$relative_path($$OUT_PWD/android-build/src/qt/android/, $$_PRO_FILE_PWD_)
+ANDROID_SUPPORT_OUTPUT = $$relative_path($$OUT_PWD/android-build/src/org/qtproject/qt5/android/bindings, $$_PRO_FILE_PWD_)
 
-qmlandroid.input = QMLANDROID_INPUT
-qmlandroid.output = ${QMAKE_FILE_IN_NAME}
-!contains(TEMPLATE, vc.*): qmlandroid.variable_out = PRE_TARGETDEPS
-qmlandroid.commands = ( $$sprintf($$QMAKE_MKDIR_CMD, $$QMLANDROID_OUTPUT) ) && $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} $$QMLANDROID_OUTPUT
-qmlandroid.name = COPY ${QMAKE_FILE_IN}
-qmlandroid.CONFIG = no_link no_clean
-QMAKE_EXTRA_COMPILERS += qmlandroid
+android_support.input = ANDROID_SUPPORT_INPUT
+android_support.output = ${QMAKE_FILE_IN_NAME}
+!contains(TEMPLATE, vc.*): android_support.variable_out = PRE_TARGETDEPS
+android_support.commands = ( $$sprintf($$QMAKE_MKDIR_CMD, $$ANDROID_SUPPORT_OUTPUT) ) && $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} $$ANDROID_SUPPORT_OUTPUT
+android_support.name = COPY ${QMAKE_FILE_IN}
+android_support.CONFIG = no_link no_clean
+QMAKE_EXTRA_COMPILERS += android_support
diff --git a/src/android/app/qnativeandroidactivity.cpp b/src/android/app/qnativeandroidactivity.cpp
index 6412158..68fd292 100644
--- a/src/android/app/qnativeandroidactivity.cpp
+++ b/src/android/app/qnativeandroidactivity.cpp
@@ -175,7 +175,7 @@ void QNativeAndroidActivity::updateOptionsMenu()
 
     QAndroidJniObject activity = instance();
     QtQmlAndroid::callFunction([=]() {
-        activity.callMethod<void>("setOptionsMenu", "(Lqt/android/view/QtNativeMenu;)V", menu.object());
+        activity.callMethod<void>("setOptionsMenu", "(Lorg/qtproject/qt5/android/bindings/view/QtNativeMenu;)V", menu.object());
     });
 }
 
diff --git a/src/android/app/qnativeandroidservice.cpp b/src/android/app/qnativeandroidservice.cpp
index 5c5e9a9..94be518 100644
--- a/src/android/app/qnativeandroidservice.cpp
+++ b/src/android/app/qnativeandroidservice.cpp
@@ -108,7 +108,7 @@ void QNativeAndroidService::stop()
 
 QAndroidJniObject QNativeAndroidService::onCreate()
 {
-    return QAndroidJniObject("qt/android/app/QtNativeService");
+    return QAndroidJniObject("org/qtproject/qt5/android/bindings/app/QtNativeService");
 }
 
 void QNativeAndroidService::onInflate(QAndroidJniObject& instance)
diff --git a/src/android/java/java.pri b/src/android/java/java.pri
index 2bc8037..71cf81b 100644
--- a/src/android/java/java.pri
+++ b/src/android/java/java.pri
@@ -1,20 +1,20 @@
 OTHER_FILES += \
-    $$PWD/native/qt/android/app/QtNativeActivity.java \
-    $$PWD/native/qt/android/app/QtNativeService.java \
-    $$PWD/native/qt/android/support/v4/widget/QtNativeSwipeRefreshLayoutListener.java \
-    $$PWD/native/qt/android/support/v7/widget/QtNativeRecyclerAdapter.java \
-    $$PWD/native/qt/android/view/QtNativeMenu.java \
-    $$PWD/native/qt/android/view/QtNativeMenuItem.java \
-    $$PWD/native/qt/android/view/QtNativeViewListener.java \
-    $$PWD/native/qt/android/widget/QtNativeCompoundButtonListener.java \
-    $$PWD/native/qt/android/widget/QtNativeNumberPickerListener.java \
-    $$PWD/native/qt/android/widget/QtNativeRadioGroupListener.java \
-    $$PWD/native/qt/android/widget/QtNativeRatingBarListener.java \
-    $$PWD/native/qt/android/widget/QtNativeScrollView.java \
-    $$PWD/native/qt/android/widget/QtNativeSeekBarListener.java \
-    $$PWD/natiev/qt/android/widget/QtNativeTabHostListener.java
+    $$PWD/src/org/qtproject/qt5/android/bindings/app/QtNativeActivity.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/app/QtNativeService.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/view/QtNativeMenu.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/view/QtNativeMenuItem.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/view/QtNativeViewListener.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/widget/QtNativeCompoundButtonListener.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/widget/QtNativeNumberPickerListener.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/widget/QtNativeRadioGroupListener.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/widget/QtNativeRatingBarListener.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/widget/QtNativeScrollView.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/widget/QtNativeSeekBarListener.java \
+    $$PWD/src/org/qtproject/qt5/android/bindings/widget/QtNativeTabHostListener.java \
+    $$PWD/support/v4/widget/QtNativeSwipeRefreshLayoutListener.java \
+    $$PWD/support/v7/widget/QtNativeRecyclerAdapter.java
 
-java.files = $$PWD/native
+java.files = $$PWD/src $$PWD/support
 java.path = $$[QT_INSTALL_PREFIX]/src/android/java
 !prefix_build: COPIES += java
 INSTALLS += java
diff --git a/src/android/java/native/qt/android/app/QtNativeActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/app/QtNativeActivity.java
index 5be9d9d..4369329 100644
--- a/src/android/java/native/qt/android/app/QtNativeActivity.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/app/QtNativeActivity.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.app;
+package org.qtproject.qt5.android.bindings.app;
 
 import java.util.ArrayList;
 
@@ -45,7 +45,7 @@ import android.util.TypedValue;
 
 import android.view.Menu;
 
-import qt.android.view.QtNativeMenu;
+import org.qtproject.qt5.android.bindings.view.QtNativeMenu;
 
 public class QtNativeActivity extends org.qtproject.qt5.android.bindings.QtActivity
 {
diff --git a/src/android/java/native/qt/android/app/QtNativeService.java b/src/android/java/src/org/qtproject/qt5/android/bindings/app/QtNativeService.java
index 85dc7af..6ffff4f 100644
--- a/src/android/java/native/qt/android/app/QtNativeService.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/app/QtNativeService.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.app;
+package org.qtproject.qt5.android.bindings.app;
 
 import android.app.Service;
 import android.os.IBinder;
diff --git a/src/android/java/native/qt/android/view/QtNativeMenu.java b/src/android/java/src/org/qtproject/qt5/android/bindings/view/QtNativeMenu.java
index db08b55..9c99071 100644
--- a/src/android/java/native/qt/android/view/QtNativeMenu.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/view/QtNativeMenu.java
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-package qt.android.view;
+package org.qtproject.qt5.android.bindings.view;
 
 import java.util.ArrayList;
 
 import android.view.Menu;
 import android.view.MenuItem;
 
-import qt.android.view.QtNativeMenuItem;
+import org.qtproject.qt5.android.bindings.view.QtNativeMenuItem;
 
 public class QtNativeMenu
 {
diff --git a/src/android/java/native/qt/android/view/QtNativeMenuItem.java b/src/android/java/src/org/qtproject/qt5/android/bindings/view/QtNativeMenuItem.java
index c62c23a..73f497a 100644
--- a/src/android/java/native/qt/android/view/QtNativeMenuItem.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/view/QtNativeMenuItem.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.view;
+package org.qtproject.qt5.android.bindings.view;
 
 import java.lang.CharSequence;
 import android.view.MenuItem;
diff --git a/src/android/java/native/qt/android/view/QtNativeViewListener.java b/src/android/java/src/org/qtproject/qt5/android/bindings/view/QtNativeViewListener.java
index dc3462f..b5422cb 100644
--- a/src/android/java/native/qt/android/view/QtNativeViewListener.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/view/QtNativeViewListener.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.view;
+package org.qtproject.qt5.android.bindings.view;
 
 import android.view.View;
 import android.widget.AdapterView;
diff --git a/src/android/java/native/qt/android/widget/QtNativeAdapterViewListener.java b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeAdapterViewListener.java
index f834334..6a4abc9 100644
--- a/src/android/java/native/qt/android/widget/QtNativeAdapterViewListener.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeAdapterViewListener.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.widget;
+package org.qtproject.qt5.android.bindings.widget;
 
 import android.view.View;
 import android.widget.Spinner;
diff --git a/src/android/java/native/qt/android/widget/QtNativeCompoundButtonListener.java b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeCompoundButtonListener.java
index bc113be..fa07727 100644
--- a/src/android/java/native/qt/android/widget/QtNativeCompoundButtonListener.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeCompoundButtonListener.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.widget;
+package org.qtproject.qt5.android.bindings.widget;
 
 import android.widget.CompoundButton;
 
diff --git a/src/android/java/native/qt/android/widget/QtNativeNumberPickerListener.java b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeNumberPickerListener.java
index fa5322a..4788e9b 100644
--- a/src/android/java/native/qt/android/widget/QtNativeNumberPickerListener.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeNumberPickerListener.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.widget;
+package org.qtproject.qt5.android.bindings.widget;
 
 import android.widget.NumberPicker;
 
diff --git a/src/android/java/native/qt/android/widget/QtNativeRadioGroupListener.java b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeRadioGroupListener.java
index 365ae27..38ce422 100644
--- a/src/android/java/native/qt/android/widget/QtNativeRadioGroupListener.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeRadioGroupListener.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.widget;
+package org.qtproject.qt5.android.bindings.widget;
 
 import android.widget.RadioGroup;
 import android.widget.RadioButton;
diff --git a/src/android/java/native/qt/android/widget/QtNativeRatingBarListener.java b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeRatingBarListener.java
index f142857..936f9e5 100644
--- a/src/android/java/native/qt/android/widget/QtNativeRatingBarListener.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeRatingBarListener.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.widget;
+package org.qtproject.qt5.android.bindings.widget;
 
 import android.widget.RatingBar;
 
diff --git a/src/android/java/native/qt/android/widget/QtNativeScrollView.java b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeScrollView.java
index 1bb1e20..0e50b95 100644
--- a/src/android/java/native/qt/android/widget/QtNativeScrollView.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeScrollView.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.widget;
+package org.qtproject.qt5.android.bindings.widget;
 
 import android.content.Context;
 import android.widget.ScrollView;
diff --git a/src/android/java/native/qt/android/widget/QtNativeSeekBarListener.java b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeSeekBarListener.java
index 4fe28aa..229a5c4 100644
--- a/src/android/java/native/qt/android/widget/QtNativeSeekBarListener.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeSeekBarListener.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.widget;
+package org.qtproject.qt5.android.bindings.widget;
 
 import android.widget.SeekBar;
 
diff --git a/src/android/java/native/qt/android/widget/QtNativeTabHostListener.java b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeTabHostListener.java
index 8edd82d..3d7b3a9 100644
--- a/src/android/java/native/qt/android/widget/QtNativeTabHostListener.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/widget/QtNativeTabHostListener.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.widget;
+package org.qtproject.qt5.android.bindings.widget;
 
 import android.widget.TabHost;
 
diff --git a/src/android/java/native/qt/android/support/v4/widget/QtNativeSwipeRefreshLayoutListener.java b/src/android/java/support/v4/widget/QtNativeSwipeRefreshLayoutListener.java
index b33a2c6..4a82b27 100644
--- a/src/android/java/native/qt/android/support/v4/widget/QtNativeSwipeRefreshLayoutListener.java
+++ b/src/android/java/support/v4/widget/QtNativeSwipeRefreshLayoutListener.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.support.v4.widget;
+package org.qtproject.qt5.android.bindings.support.v4.widget;
 
 import android.support.v4.widget.SwipeRefreshLayout;
 
diff --git a/src/android/java/native/qt/android/support/v7/widget/QtNativeRecyclerAdapter.java b/src/android/java/support/v7/widget/QtNativeRecyclerAdapter.java
index 095a7c5..620feef 100644
--- a/src/android/java/native/qt/android/support/v7/widget/QtNativeRecyclerAdapter.java
+++ b/src/android/java/support/v7/widget/QtNativeRecyclerAdapter.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package qt.android.support.v7.widget;
+package org.qtproject.qt5.android.bindings.support.v7.widget;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
index 98dab5d..2ab766d 100644
--- a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
@@ -76,7 +76,7 @@ void QNativeAndroidSwipeRefreshLayout::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidViewGroup::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/support/v4/widget/QtNativeSwipeRefreshLayoutListener",
+    m_listener = QAndroidJniObject("org/qtproject/qt5/android/bindings/support/v4/widget/QtNativeSwipeRefreshLayoutListener",
                                    "(Landroid/support/v4/widget/SwipeRefreshLayout;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
index 7434be8..c02b040 100644
--- a/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
+++ b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
@@ -77,7 +77,7 @@ void QNativeAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate)
 
 QAndroidJniObject QNativeAndroidRecyclerAdapter::onCreate()
 {
-    return QAndroidJniObject("qt/android/support/v7/widget/QtNativeRecyclerAdapter",
+    return QAndroidJniObject("org/qtproject/qt5/android/bindings/support/v7/widget/QtNativeRecyclerAdapter",
                              "(IJ)V",
                              m_count,
                              reinterpret_cast<jlong>(this));
@@ -99,8 +99,8 @@ void QNativeAndroidRecyclerAdapter::onInflate(QAndroidJniObject &instance)
 
 void QNativeAndroidRecyclerAdapter::onRegisterNativeMethods(jobject adapter)
 {
-    JNINativeMethod methods[] {{"onCreateViewHolder", "(JLandroid/view/ViewGroup;I)Lqt/android/support/v7/widget/QtNativeRecyclerAdapter$ViewHolder;", reinterpret_cast<void *>(onCreateViewHolder)},
-                               {"onBindViewHolder", "(JLqt/android/support/v7/widget/QtNativeRecyclerAdapter$ViewHolder;I)V", reinterpret_cast<void *>(onBindViewHolder)}};
+    JNINativeMethod methods[] {{"onCreateViewHolder", "(JLandroid/view/ViewGroup;I)Lorg/qtproject/qt5/android/bindings/support/v7/widget/QtNativeRecyclerAdapter$ViewHolder;", reinterpret_cast<void *>(onCreateViewHolder)},
+                               {"onBindViewHolder", "(JLorg/qtproject/qt5/android/bindings/support/v7/widget/QtNativeRecyclerAdapter$ViewHolder;I)V", reinterpret_cast<void *>(onBindViewHolder)}};
 
     QAndroidJniEnvironment env;
     jclass cls = env->GetObjectClass(adapter);
@@ -119,7 +119,7 @@ jobject QNativeAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject o
         QNativeAndroidView *item = nullptr;
         QMetaObject::invokeMethod(adapter, "createItem", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QNativeAndroidView *, item));
         item->construct();
-        adapter->m_holders += QAndroidJniObject("qt/android/support/v7/widget/QtNativeRecyclerAdapter$ViewHolder",
+        adapter->m_holders += QAndroidJniObject("org/qtproject/qt5/android/bindings/support/v7/widget/QtNativeRecyclerAdapter$ViewHolder",
                                                 "(Landroid/view/View;J)V",
                                                 item->instance().object(),
                                                 reinterpret_cast<jlong>(item));
diff --git a/src/android/view/qnativeandroidmenu.cpp b/src/android/view/qnativeandroidmenu.cpp
index 7c3c3bd..d36fe38 100644
--- a/src/android/view/qnativeandroidmenu.cpp
+++ b/src/android/view/qnativeandroidmenu.cpp
@@ -57,7 +57,7 @@ QList<QNativeAndroidMenuItem *> QNativeAndroidMenu::items() const
 
 QAndroidJniObject QNativeAndroidMenu::onCreate()
 {
-    return QAndroidJniObject("qt/android/view/QtNativeMenu");
+    return QAndroidJniObject("org/qtproject/qt5/android/bindings/view/QtNativeMenu");
 }
 
 void QNativeAndroidMenu::onInflate(QAndroidJniObject &instance)
@@ -65,7 +65,7 @@ void QNativeAndroidMenu::onInflate(QAndroidJniObject &instance)
     foreach (QNativeAndroidMenuItem *item, items()) {
         item->construct();
         if (item->isValid())
-            instance.callMethod<void>("add", "(Lqt/android/view/QtNativeMenuItem;)V", item->instance().object());
+            instance.callMethod<void>("add", "(Lorg/qtproject/qt5/android/bindings/view/QtNativeMenuItem;)V", item->instance().object());
     }
 }
 
diff --git a/src/android/view/qnativeandroidmenuitem.cpp b/src/android/view/qnativeandroidmenuitem.cpp
index 4b6e094..1814f27 100644
--- a/src/android/view/qnativeandroidmenuitem.cpp
+++ b/src/android/view/qnativeandroidmenuitem.cpp
@@ -159,7 +159,7 @@ void QNativeAndroidMenuItem::setActionView(QNativeAndroidView *view)
 
 QAndroidJniObject QNativeAndroidMenuItem::onCreate()
 {
-    return QAndroidJniObject("qt/android/view/QtNativeMenuItem",
+    return QAndroidJniObject("org/qtproject/qt5/android/bindings/view/QtNativeMenuItem",
                              "(J)V",
                              reinterpret_cast<jlong>(this));
 }
diff --git a/src/android/view/qnativeandroidview.cpp b/src/android/view/qnativeandroidview.cpp
index e621ce6..a7763e6 100644
--- a/src/android/view/qnativeandroidview.cpp
+++ b/src/android/view/qnativeandroidview.cpp
@@ -715,7 +715,7 @@ void QNativeAndroidView::onInflate(QAndroidJniObject &instance)
 
     QNativeAndroidContextual::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/view/QtNativeViewListener",
+    m_listener = QAndroidJniObject("org/qtproject/qt5/android/bindings/view/QtNativeViewListener",
                                    "(Landroid/view/View;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidadapterview.cpp b/src/android/widget/qnativeandroidadapterview.cpp
index e921a7b..167895e 100644
--- a/src/android/widget/qnativeandroidadapterview.cpp
+++ b/src/android/widget/qnativeandroidadapterview.cpp
@@ -83,7 +83,7 @@ QAndroidJniObject QNativeAndroidAdapterView::onCreate()
 
 void QNativeAndroidAdapterView::onInflate(QAndroidJniObject &instance)
 {
-    m_listener = QAndroidJniObject("qt/android/widget/QtNativeAdapterViewListener",
+    m_listener = QAndroidJniObject("org/qtproject/qt5/android/bindings/widget/QtNativeAdapterViewListener",
                                    "(Landroid/widget/AdapterView;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidcompoundbutton.cpp b/src/android/widget/qnativeandroidcompoundbutton.cpp
index 73727e8..8e52135 100644
--- a/src/android/widget/qnativeandroidcompoundbutton.cpp
+++ b/src/android/widget/qnativeandroidcompoundbutton.cpp
@@ -81,7 +81,7 @@ void QNativeAndroidCompoundButton::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidButton::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QtNativeCompoundButtonListener",
+    m_listener = QAndroidJniObject("org/qtproject/qt5/android/bindings/widget/QtNativeCompoundButtonListener",
                                    "(Landroid/widget/CompoundButton;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidnumberpicker.cpp b/src/android/widget/qnativeandroidnumberpicker.cpp
index 00fa2e7..0572aa5 100644
--- a/src/android/widget/qnativeandroidnumberpicker.cpp
+++ b/src/android/widget/qnativeandroidnumberpicker.cpp
@@ -76,7 +76,7 @@ void QNativeAndroidNumberPicker::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidLinearLayout::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QtNativeNumberPickerListener",
+    m_listener = QAndroidJniObject("org/qtproject/qt5/android/bindings/widget/QtNativeNumberPickerListener",
                                    "(Landroid/widget/NumberPicker;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidradiogroup.cpp b/src/android/widget/qnativeandroidradiogroup.cpp
index 183c733..bcd8d20 100644
--- a/src/android/widget/qnativeandroidradiogroup.cpp
+++ b/src/android/widget/qnativeandroidradiogroup.cpp
@@ -72,7 +72,7 @@ void QNativeAndroidRadioGroup::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidLinearLayout::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QtNativeRadioGroupListener",
+    m_listener = QAndroidJniObject("org/qtproject/qt5/android/bindings/widget/QtNativeRadioGroupListener",
                                    "(Landroid/widget/RadioGroup;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidratingbar.cpp b/src/android/widget/qnativeandroidratingbar.cpp
index a3ebd07..bd5cdda 100644
--- a/src/android/widget/qnativeandroidratingbar.cpp
+++ b/src/android/widget/qnativeandroidratingbar.cpp
@@ -76,7 +76,7 @@ void QNativeAndroidRatingBar::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidAbsSeekBar::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QtNativeRatingBarListener",
+    m_listener = QAndroidJniObject("org/qtproject/qt5/android/bindings/widget/QtNativeRatingBarListener",
                                    "(Landroid/widget/RatingBar;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidscrollview.cpp b/src/android/widget/qnativeandroidscrollview.cpp
index 11ea491..753961f 100644
--- a/src/android/widget/qnativeandroidscrollview.cpp
+++ b/src/android/widget/qnativeandroidscrollview.cpp
@@ -90,7 +90,7 @@ bool QNativeAndroidScrollView::updateScrollY(int y)
 
 QAndroidJniObject QNativeAndroidScrollView::onCreate()
 {
-    return QAndroidJniObject("qt/android/widget/QtNativeScrollView",
+    return QAndroidJniObject("org/qtproject/qt5/android/bindings/widget/QtNativeScrollView",
                              "(Landroid/content/Context;J)V",
                              ctx().object(),
                              reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidseekbar.cpp b/src/android/widget/qnativeandroidseekbar.cpp
index 4f73ddf..4c3c7c1 100644
--- a/src/android/widget/qnativeandroidseekbar.cpp
+++ b/src/android/widget/qnativeandroidseekbar.cpp
@@ -54,7 +54,7 @@ void QNativeAndroidSeekBar::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidAbsSeekBar::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QtNativeSeekBarListener",
+    m_listener = QAndroidJniObject("org/qtproject/qt5/android/bindings/widget/QtNativeSeekBarListener",
                                    "(Landroid/widget/SeekBar;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidtabhost.cpp b/src/android/widget/qnativeandroidtabhost.cpp
index ea27050..8b62c3e 100644
--- a/src/android/widget/qnativeandroidtabhost.cpp
+++ b/src/android/widget/qnativeandroidtabhost.cpp
@@ -55,7 +55,7 @@ void QNativeAndroidTabHost::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidFrameLayout::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QtNativeTabHostListener",
+    m_listener = QAndroidJniObject("org/qtproject/qt5/android/bindings/widget/QtNativeTabHostListener",
                                    "(Landroid/widget/TabHost;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));