Merge branch 'stable' into dev

Change-Id: I483aac84fe5826f8f9b789385068cee3e16069f0

26 files changed, 644 insertions, 700 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..1a045fa
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+.tag                    export-subst
+.gitignore              export-ignore
+.gitattributes          export-ignore
+.commit-template        export-ignore
diff --git a/examples/androidextras/androidextras.pro b/examples/androidextras/androidextras.pro
index 31640ad..ce3926f 100644
--- a/examples/androidextras/androidextras.pro
+++ b/examples/androidextras/androidextras.pro
@@ -1,5 +1,7 @@
 TEMPLATE = subdirs
 android {
-    SUBDIRS += notification
-    EXAMPLE_FILES += notification
+    qtHaveModule(quick) {
+        SUBDIRS += notification
+        EXAMPLE_FILES += notification
+    }
 }
diff --git a/examples/androidextras/notification/android-sources/res/drawable/icon.png b/examples/androidextras/notification/android-sources/res/drawable/icon.png
new file mode 100644
index 0000000..156243d
--- /dev/null
+++ b/examples/androidextras/notification/android-sources/res/drawable/icon.png
diff --git a/examples/androidextras/notification/androidjnibindings.cpp b/examples/androidextras/notification/androidjnibindings.cpp
deleted file mode 100644
index 98280c2..0000000
--- a/examples/androidextras/notification/androidjnibindings.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtWinExtras module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "androidjnibindings.h"
-
-jint JNICALL JNI_OnLoad(JavaVM *vm, void *)
-{
-    JNIEnv *env;
-    if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_4) != JNI_OK) {
-        qFatal("Couldn't initialize environment!");
-        return -1;
-    }
-
-    AndroidJNIBindings::detectNotificationClientClass(env);
-
-    return JNI_VERSION_1_4;
-}
-
-jclass AndroidJNIBindings::m_notificationClientClass = 0;
-void AndroidJNIBindings::detectNotificationClientClass(JNIEnv *environment)
-{
-    jclass clazz = environment->FindClass("org/qtproject/example/notification/NotificationClient");
-    if (clazz == 0) {
-        environment->ExceptionDescribe();
-        environment->ExceptionClear();
-        return;
-    }
-
-    m_notificationClientClass = reinterpret_cast<jclass>(environment->NewGlobalRef(clazz));
-}
diff --git a/examples/androidextras/notification/androidjnibindings.h b/examples/androidextras/notification/androidjnibindings.h
deleted file mode 100644
index 64cca54..0000000
--- a/examples/androidextras/notification/androidjnibindings.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtWinExtras module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ANDROIDJNIBINDINGS_H
-#define ANDROIDJNIBINDINGS_H
-
-#include <QtAndroidExtras/QJNIObject>
-
-class AndroidJNIBindings
-{
-public:
-    static jclass notificationClientClass()
-    {
-        return m_notificationClientClass;
-    }
-
-    static void detectNotificationClientClass(JNIEnv *environment);
-
-private:
-    static jclass m_notificationClientClass;
-};
-
-#endif // ANDROIDJNIBINDINGS_H
diff --git a/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc b/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc
new file mode 100644
index 0000000..1eb6c6f
--- /dev/null
+++ b/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \title Qt Notifier
+    \ingroup examples-qtandroidextras
+    \example notification
+    \brief Demonstrates calling Java code from an Android application.
+
+    \image notification.png
+
+    This example demonstrates how to add a custom Java class to an Android application, and
+    how to call into this using the JNI convenience APIs in the Qt Android Extras module.
+
+    Click on either of the smiley faces to put a notification in the status area of the Android
+    device.
+*/
diff --git a/examples/androidextras/notification/notification.pro b/examples/androidextras/notification/notification.pro
index 9d57ca3..8459599 100644
--- a/examples/androidextras/notification/notification.pro
+++ b/examples/androidextras/notification/notification.pro
@@ -8,8 +8,7 @@ ANDROID_APP_NAME = Qt Notifier
 
 SOURCES += \
     main.cpp \
-    notificationclient.cpp \
-    androidjnibindings.cpp
+    notificationclient.cpp
 
 OTHER_FILES += \
     qml/main.qml \
@@ -20,5 +19,4 @@ RESOURCES += \
     main.qrc
 
 HEADERS += \
-    notificationclient.h \
-    androidjnibindings.h
+    notificationclient.h
diff --git a/examples/androidextras/notification/notificationclient.cpp b/examples/androidextras/notification/notificationclient.cpp
index d9cbf84..81f80b8 100644
--- a/examples/androidextras/notification/notificationclient.cpp
+++ b/examples/androidextras/notification/notificationclient.cpp
@@ -40,9 +40,8 @@
 ****************************************************************************/
 
 #include "notificationclient.h"
-#include "androidjnibindings.h"
 
-#include <QtAndroidExtras/QJNIObject>
+#include <QtAndroidExtras/QAndroidJniObject>
 
 NotificationClient::NotificationClient(QObject *parent)
     : QObject(parent)
@@ -66,8 +65,8 @@ QString NotificationClient::notification() const
 
 void NotificationClient::updateAndroidNotification()
 {
-    QJNIObject javaNotification = QJNIObject::fromString(m_notification);
-    QJNIObject::callStaticMethod<void>(AndroidJNIBindings::notificationClientClass(),
+    QAndroidJniObject javaNotification = QAndroidJniObject::fromString(m_notification);
+    QAndroidJniObject::callStaticMethod<void>("org/qtproject/example/notification/NotificationClient",
                                        "notify",
                                        "(Ljava/lang/String;)V",
                                        javaNotification.object<jstring>());
diff --git a/src/androidextras/doc/qtandroidextras.qdocconf b/src/androidextras/doc/qtandroidextras.qdocconf
index 02e5390..c69586c 100644
--- a/src/androidextras/doc/qtandroidextras.qdocconf
+++ b/src/androidextras/doc/qtandroidextras.qdocconf
@@ -26,7 +26,9 @@ qhp.QtAndroidExtras.subprojects.classes.selectors = class fake:headerfile
 qhp.QtAndroidExtras.subprojects.classes.sortPages = true
 
 tagfile = ../../../doc/qtandroidextras/qtandroidextras.tags
-depends += qtcore
+
+depends += qtcore qtdoc
+
 headerdirs += ..
 sourcedirs += ..
 exampledirs += ../../../examples/androidextras \
diff --git a/src/androidextras/doc/snippets/code/src_androidextras_qjnienvironment.cpp b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp
index bf1bd28..3b86f47 100644
--- a/src/androidextras/doc/snippets/code/src_androidextras_qjnienvironment.cpp
+++ b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp
@@ -38,15 +38,15 @@
  **
  ****************************************************************************/
 
-//! [Create QJNIEnvironment]
+//! [Create QAndroidJniEnvironment]
 
 bool exceptionCheck()
 {
     /*
-      The QJNIEnvironment attaches the current thread to the JavaVM on
+      The QAndroidJniEnvironment attaches the current thread to the JavaVM on
       creation and detach when it goes out of scope.
      */
-    QJNIEnvironment qjniEnv;
+    QAndroidJniEnvironment qjniEnv;
     return qjniEnv->ExceptionCheck();
 }
-//! [Create QJNIEnvironment]
+//! [Create QAndroidJniEnvironment]
diff --git a/src/androidextras/doc/snippets/code/src_androidextras_qjniobject.cpp b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp
index 8be1053..899ca74 100644
--- a/src/androidextras/doc/snippets/code/src_androidextras_qjniobject.cpp
+++ b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp
@@ -39,15 +39,15 @@
  ****************************************************************************/
 
 //! [Working with lists]
-QStringList getTrackTitles(const QJNIObject &album) {
+QStringList getTrackTitles(const QAndroidJniObject &album) {
     QStringList stringList;
-    QJNIObject list = album.callObjectMethod<jobject>("getTitles",
+    QAndroidJniObject list = album.callObjectMethod<jobject>("getTitles",
                                                       "()Ljava/util/List;");
 
     if (list.isValid()) {
         const int size = list.callMethod<jint>("size");
         for (int i = 0; i < size; ++i) {
-            QJNIObject title = list.callObjectMethod<jobject>("get", "(I)Ljava/lang/Object;", i);
+            QAndroidJniObject title = list.callObjectMethod<jobject>("get", "(I)Ljava/lang/Object;", i);
             stringList.append(title.toString());
         }
     }
@@ -55,26 +55,26 @@ QStringList getTrackTitles(const QJNIObject &album) {
 }
 //! [Working with lists]
 
-//! [QJNIObject scope]
+//! [QAndroidJniObject scope]
 void function()
 {
     QString helloString("Hello");
     jstring myJString = 0;
     {
-        QJNIObject string = QJNIObject::fromString(string);
+        QAndroidJniObject string = QAndroidJniObject::fromString(string);
         myJString = string.object<jstring>();
     }
 
    // Ops! myJString is no longer valid.
 }
-//! [QJNIObject scope]
+//! [QAndroidJniObject scope]
 
 //! [Check for exceptions]
 void function()
 {
-    QJNIObject myString = QJNIObject::fromString("Hello");
+    QAndroidJniObject myString = QAndroidJniObject::fromString("Hello");
     jchar c = myString.callMethod<jchar>("charAt", "(I)C", 1000);
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     if (env->ExceptionCheck()) {
         // Handle exception here.
         env->ExceptionClear();
diff --git a/src/androidextras/jni/jni.pri b/src/androidextras/jni/jni.pri
index f702fee..6f67b28 100644
--- a/src/androidextras/jni/jni.pri
+++ b/src/androidextras/jni/jni.pri
@@ -1,7 +1,7 @@
 HEADERS += \
-           $$PWD/qjniobject.h \
-           $$PWD/qjnienvironment.h
+           $$PWD/qandroidjniobject.h \
+           $$PWD/qandroidjnienvironment.h
 
 SOURCES += \
-           $$PWD/qjniobject.cpp \
-           $$PWD/qjnienvironment.cpp
+           $$PWD/qandroidjniobject.cpp \
+           $$PWD/qandroidjnienvironment.cpp
diff --git a/src/androidextras/jni/qjnienvironment.cpp b/src/androidextras/jni/qandroidjnienvironment.cpp
index e27e5ce..48a817b 100644
--- a/src/androidextras/jni/qjnienvironment.cpp
+++ b/src/androidextras/jni/qandroidjnienvironment.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qjnienvironment.h"
+#include "qandroidjnienvironment.h"
 #include <QtCore/private/qjni_p.h>
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtCore/qthreadstorage.h>
@@ -47,65 +47,65 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QJNIEnvironment
+    \class QAndroidJniEnvironment
     \inmodule QtAndroidExtras
-    \brief The QJNIEnvironment provides access to the JNI Environment.
+    \brief The QAndroidJniEnvironment provides access to the JNI Environment.
     \since 5.2
 */
 
 /*!
-    \fn QJNIEnvironment::QJNIEnvironment()
+    \fn QAndroidJniEnvironment::QAndroidJniEnvironment()
 
-    Constructs a new QJNIEnvironment object and attach the current thread to the Java VM.
+    Constructs a new QAndroidJniEnvironment object and attach the current thread to the Java VM.
 
-    \snippet code/src_androidextras_qjnienvironment.cpp Create QJNIEnvironment
+    \snippet code/src_androidextras_qandroidjnienvironment.cpp Create QAndroidJniEnvironment
 */
 
 /*!
-    \fn QJNIEnvironment::~QJNIEnvironment()
+    \fn QAndroidJniEnvironment::~QAndroidJniEnvironment()
 
-    Detaches the current thread from the Java VM and destroys the QJNIEnvironment object.
+    Detaches the current thread from the Java VM and destroys the QAndroidJniEnvironment object.
 */
 
 /*!
-    \fn JavaVM *QJNIEnvironment::javaVM()
+    \fn JavaVM *QAndroidJniEnvironment::javaVM()
 
     Returns the Java VM interface.
 */
 
 /*!
-    \fn JNIEnv *QJNIEnvironment::operator->()
+    \fn JNIEnv *QAndroidJniEnvironment::operator->()
 
-    Provides access to the QJNIEnvironment's JNIEnv pointer.
+    Provides access to the QAndroidJniEnvironment's JNIEnv pointer.
 */
 
 /*!
-    \fn QJNIEnvironment::operator JNIEnv *() const
+    \fn QAndroidJniEnvironment::operator JNIEnv *() const
 
     Returns the the JNI Environment pointer.
  */
 
 
-QJNIEnvironment::QJNIEnvironment()
+QAndroidJniEnvironment::QAndroidJniEnvironment()
     : d(new QJNIEnvironmentPrivate)
 {
 }
 
-QJNIEnvironment::~QJNIEnvironment()
+QAndroidJniEnvironment::~QAndroidJniEnvironment()
 {
 }
 
-JavaVM *QJNIEnvironment::javaVM()
+JavaVM *QAndroidJniEnvironment::javaVM()
 {
     return QtAndroidPrivate::javaVM();
 }
 
-JNIEnv *QJNIEnvironment::operator->()
+JNIEnv *QAndroidJniEnvironment::operator->()
 {
     return d->jniEnv;
 }
 
-QJNIEnvironment::operator JNIEnv*() const
+QAndroidJniEnvironment::operator JNIEnv*() const
 {
     return d->jniEnv;
 }
diff --git a/src/androidextras/jni/qjnienvironment.h b/src/androidextras/jni/qandroidjnienvironment.h
index 571f44e..1c4fa4e 100644
--- a/src/androidextras/jni/qjnienvironment.h
+++ b/src/androidextras/jni/qandroidjnienvironment.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QJNIENVIRONMENT_H
-#define QJNIENVIRONMENT_H
+#ifndef QANDROIDJNIENVIRONMENT_H
+#define QANDROIDJNIENVIRONMENT_H
 
 #include <jni.h>
 #include <QtAndroidExtras/qandroidextrasglobal.h>
@@ -51,20 +51,20 @@ QT_BEGIN_NAMESPACE
 
 struct QJNIEnvironmentPrivate;
 
-class Q_ANDROIDEXTRAS_EXPORT QJNIEnvironment
+class Q_ANDROIDEXTRAS_EXPORT QAndroidJniEnvironment
 {
 public:
-    QJNIEnvironment();
-    ~QJNIEnvironment();
+    QAndroidJniEnvironment();
+    ~QAndroidJniEnvironment();
     static JavaVM *javaVM();
     JNIEnv *operator->();
     operator JNIEnv*() const;
 
 private:
-    Q_DISABLE_COPY(QJNIEnvironment)
+    Q_DISABLE_COPY(QAndroidJniEnvironment)
     QScopedPointer<QJNIEnvironmentPrivate> d;
 };
 
 QT_END_NAMESPACE
 
-#endif // QJNIENVIRONMENT_H
+#endif // QANDROIDJNIENVIRONMENT_H
diff --git a/src/androidextras/jni/qjniobject.cpp b/src/androidextras/jni/qandroidjniobject.cpp
index c2a510e..79740e3 100644
--- a/src/androidextras/jni/qjniobject.cpp
+++ b/src/androidextras/jni/qandroidjniobject.cpp
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#include "qjniobject.h"
+#include "qandroidjniobject.h"
 #include <QtCore/private/qjni_p.h>
 #include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QJNIObject
+    \class QAndroidJniObject
     \inmodule QtAndroidExtras
-    \brief The QJNIObject is a C++ wrapper around a Java class.
+    \brief The QAndroidJniObject is a C++ wrapper around a Java class.
     \since 5.2
 
-    QJNIObject provides APIs to call Java methods
+    QAndroidJniObject provides APIs to call Java methods
 
     \section1 JNI types
 
@@ -88,168 +88,168 @@ QT_BEGIN_NAMESPACE
 
     - Class name strings needs to be the fully-qualified class name, for example: "java/lang/String".
     - Method signatures are written as "(Arguments)ReturnType"
-    - All object types are returned as a QJNIObject.
+    - All object types are returned as a QAndroidJniObject.
 
     \section1 Handling Java exception:
 
     When calling Java functions that might throw an exception, it is important that you handle and
     clear out the exception before continuing.
 
-    \snippet code/src_androidextras_qjniobject.cpp Check for exceptions
+    \snippet code/src_androidextras_qandroidjniobject.cpp Check for exceptions
 
     For more information about JNI see: \l http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/jniTOC.html
 */
 
 /*!
-    \fn QJNIObject::QJNIObject()
+    \fn QAndroidJniObject::QAndroidJniObject()
 
-    Constructs an invalid QJNIObject.
+    Constructs an invalid QAndroidJniObject.
 
     \sa isValid()
 */
 
 /*!
-    \fn QJNIObject::QJNIObject(const char *className)
+    \fn QAndroidJniObject::QAndroidJniObject(const char *className)
 
-    Constructs a new QJNIObject by calling the default constructor of \a className.
+    Constructs a new QAndroidJniObject by calling the default constructor of \a className.
 
     \code
 
     ...
-    QJNIObject myJavaString("java/lang/String");
+    QAndroidJniObject myJavaString("java/lang/String");
     ...
 
     \endcode
 */
 
 /*!
-    \fn QJNIObject::QJNIObject(const char *className, const char *signature, ...)
+    \fn QAndroidJniObject::QAndroidJniObject(const char *className, const char *signature, ...)
 
-    Constructs a new QJNIObject by calling the constructor of \a className with \a signature
+    Constructs a new QAndroidJniObject by calling the constructor of \a className with \a signature
     and arguments.
 
     \code
 
     ...
     jstring myJStringArg = ...;
-    QJNIObject myNewJavaString("java/lang/String", "(Ljava/lang/String;)V", myJStringArg);
+    QAndroidJniObject myNewJavaString("java/lang/String", "(Ljava/lang/String;)V", myJStringArg);
     ...
 
     \endcode
 */
 
 /*!
-    \fn QJNIObject::QJNIObject(jclass clazz)
+    \fn QAndroidJniObject::QAndroidJniObject(jclass clazz)
 
-    Constructs a new QJNIObject by calling the default constructor of \a clazz.
+    Constructs a new QAndroidJniObject by calling the default constructor of \a clazz.
 
-    Note: The QJNIObject will create a new reference to the class \a clazz
+    Note: The QAndroidJniObject will create a new reference to the class \a clazz
           and releases it again when it is destroyed. References to the class created
-          outside the QJNIObject needs to be managed by the caller.
+          outside the QAndroidJniObject needs to be managed by the caller.
 
 */
 
 /*!
-    \fn QJNIObject::QJNIObject(jclass clazz, const char *signature, ...)
+    \fn QAndroidJniObject::QAndroidJniObject(jclass clazz, const char *signature, ...)
 
-    Constructs a new QJNIObject from \a clazz by calling the constructor with \a signature
+    Constructs a new QAndroidJniObject from \a clazz by calling the constructor with \a signature
     and arguments.
 
     \code
     jclass myClass = ...;
-    QJNIObject::QJNIObject(myClazz, "(I)V", 3);
+    QAndroidJniObject::QAndroidJniObject(myClazz, "(I)V", 3);
     \endcode
 */
 
 /*!
-    \fn QJNIObject::QJNIObject(jobject object)
+    \fn QAndroidJniObject::QAndroidJniObject(jobject object)
 
-    Constructs a new QJNIObject around the Java object \a object.
+    Constructs a new QAndroidJniObject around the Java object \a object.
 
-    Note: The QJNIObject will hold a reference to the Java object \a object
+    Note: The QAndroidJniObject will hold a reference to the Java object \a object
           and release it when destroyed. Any references to the Java object \a object
-          outside QJNIObject needs to be managed by the caller.
+          outside QAndroidJniObject needs to be managed by the caller.
 */
 
 /*!
-    \fn QJNIObject::~QJNIObject()
+    \fn QAndroidJniObject::~QAndroidJniObject()
 
-    Destroys the QJNIObject and releases any references held by the QJNIObject.
+    Destroys the QAndroidJniObject and releases any references held by the QAndroidJniObject.
 */
 
 /*!
-    \fn T QJNIObject::callMethod(const char *methodName, const char *signature, ...) const
+    \fn T QAndroidJniObject::callMethod(const char *methodName, const char *signature, ...) const
 
     Calls the method \a methodName with \a signature and returns the value.
 
     \code
-    QJNIObject myJavaString = ...;
+    QAndroidJniObject myJavaString = ...;
     jint index = myJavaString.callMethod<jint>("indexOf", "(I)I", 0x0051);
     \endcode
 
 */
 
 /*!
-    \fn T QJNIObject::callMethod(const char *methodName) const
+    \fn T QAndroidJniObject::callMethod(const char *methodName) const
 
     Calls the method \a methodName and returs the value.
 
     \code
-    QJNIObject myJavaString = ...;
+    QAndroidJniObject myJavaString = ...;
     jint size = myJavaString.callMethod<jint>("length");
     \endcode
 */
 
 /*!
-    \fn QJNIObject QJNIObject::callObjectMethod(const char *methodName) const
+    \fn QAndroidJniObject QAndroidJniObject::callObjectMethod(const char *methodName) const
 
-    Calls the Java objects method \a methodName and returns a new QJNIObject for
+    Calls the Java objects method \a methodName and returns a new QAndroidJniObject for
     the returned Java object.
 
     \code
     ...
-    QJNIObject myJavaString1 = ...;
-    QJNIObject myJavaString2 = myJavaString.callObjectMethod<jstring>("toString");
+    QAndroidJniObject myJavaString1 = ...;
+    QAndroidJniObject myJavaString2 = myJavaString.callObjectMethod<jstring>("toString");
     ...
     \endcode
 */
 
 /*!
-    \fn QJNIObject QJNIObject::callObjectMethod(const char *methodName, const char *signature, ...) const
+    \fn QAndroidJniObject QAndroidJniObject::callObjectMethod(const char *methodName, const char *signature, ...) const
 
     Calls the Java object's method \a methodName with the signature \a signature and arguments
 
     \code
-    QJNIObject myJavaString; ==> "Hello, Java"
-    QJNIObject mySubstring = myJavaString.callObjectMethod<jstring>("substring", "(II)Ljava/lang/String;" 7, 10);
+    QAndroidJniObject myJavaString; ==> "Hello, Java"
+    QAndroidJniObject mySubstring = myJavaString.callObjectMethod<jstring>("substring", "(II)Ljava/lang/String;" 7, 10);
     \endcode
 */
 
 /*!
-    \fn T QJNIObject::callStaticMethod(jclass clazz, const char *methodName)
+    \fn T QAndroidJniObject::callStaticMethod(jclass clazz, const char *methodName)
 
     Calls the static method \a methodName on \a clazz and returns the value T.
 
     \code
     ...
     jclass javaMathClass = ...; // ("java/lang/Math")
-    jdouble randNr = QJNIObject::callStaticMethod<jdouble>(javaMathClass, "random");
+    jdouble randNr = QAndroidJniObject::callStaticMethod<jdouble>(javaMathClass, "random");
     ...
     \endcode
 */
 
 /*!
-    \fn T QJNIObject::callStaticMethod(const char *className, const char *methodName)
+    \fn T QAndroidJniObject::callStaticMethod(const char *className, const char *methodName)
 
     Calls the static method \a methodName on class \a className and returns the value.
 
     \code
-    jint value = QJNIObject::callStaticMethod<jint>("MyClass", "staticMethod");
+    jint value = QAndroidJniObject::callStaticMethod<jint>("MyClass", "staticMethod");
     \endcode
 */
 
 /*!
-    \fn T QJNIObject::callStaticMethod(const char *className, const char *methodName, const char *signature, ...)
+    \fn T QAndroidJniObject::callStaticMethod(const char *className, const char *methodName, const char *signature, ...)
 
     Calls the static method with \a methodName with \a signature on class \a className with optional arguments.
 
@@ -257,13 +257,13 @@ QT_BEGIN_NAMESPACE
     ...
     jint a = 2;
     jint b = 4;
-    jint max = QJNIObject::callStaticMethod<jint>("java/lang/Math", "max", "(II)I", a, b);
+    jint max = QAndroidJniObject::callStaticMethod<jint>("java/lang/Math", "max", "(II)I", a, b);
     ...
     \endcode
 */
 
 /*!
-    \fn T QJNIObject::callStaticMethod(jclass clazz, const char *methodName, const char *signature, ...)
+    \fn T QAndroidJniObject::callStaticMethod(jclass clazz, const char *methodName, const char *signature, ...)
 
     Calls the static method \a methodName with \a signature on \a clazz and returns the value T,
     unless T is void.
@@ -273,112 +273,112 @@ QT_BEGIN_NAMESPACE
     jclass javaMathClass = ...; // ("java/lang/Math")
     jint a = 2;
     jint b = 4;
-    jint max = QJNIObject::callStaticMethod<jint>(javaMathClass, "max", "(II)I", a, b);
+    jint max = QAndroidJniObject::callStaticMethod<jint>(javaMathClass, "max", "(II)I", a, b);
     ...
     \endcode
 */
 
 /*!
-    \fn QJNIObject QJNIObject::callStaticObjectMethod(const char *className, const char *methodName)
+    \fn QAndroidJniObject QAndroidJniObject::callStaticObjectMethod(const char *className, const char *methodName)
 
     Calls the static method with \a methodName on the class \a className.
 
     \code
-    QJNIObject string = QJNIObject::callStaticObjectMethod<jstring>("CustomClass", "getClassName");
+    QAndroidJniObject string = QAndroidJniObject::callStaticObjectMethod<jstring>("CustomClass", "getClassName");
     \endcode
 */
 
 /*!
-    \fn QJNIObject QJNIObject::callStaticObjectMethod(const char *className, const char *methodName, const char *signature, ...)
+    \fn QAndroidJniObject QAndroidJniObject::callStaticObjectMethod(const char *className, const char *methodName, const char *signature, ...)
 
     Calls the static method with \a methodName and \a signature on the class \a className.
 
     \code
-    QJNIObject thread = QJNIObject::callStaticObjectMethod("java/lang/Thread", "currentThread", "()Ljava/lang/Thread;");
-    QJNIObject string = QJNIObject::callStaticObjectMethod("java/lang/String", "valueOf", "(I)Ljava/lang/String;", 10);
+    QAndroidJniObject thread = QAndroidJniObject::callStaticObjectMethod("java/lang/Thread", "currentThread", "()Ljava/lang/Thread;");
+    QAndroidJniObject string = QAndroidJniObject::callStaticObjectMethod("java/lang/String", "valueOf", "(I)Ljava/lang/String;", 10);
     \endcode
 */
 
 /*!
-    \fn QJNIObject QJNIObject::callStaticObjectMethod(jclass clazz, const char *methodName)
+    \fn QAndroidJniObject QAndroidJniObject::callStaticObjectMethod(jclass clazz, const char *methodName)
 
     Calls the static method with \a methodName on \a clazz.
 
 */
 
 /*!
-    \fn QJNIObject QJNIObject::callStaticObjectMethod(jclass clazz, const char *methodName, const char *signature, ...)
+    \fn QAndroidJniObject QAndroidJniObject::callStaticObjectMethod(jclass clazz, const char *methodName, const char *signature, ...)
 
     Calls the static method with \a methodName and \a signature on class \a clazz.
 */
 
 /*!
-    \fn T QJNIObject::getField(const char *fieldName) const
+    \fn T QAndroidJniObject::getField(const char *fieldName) const
 
     Retrieves the value of the field \a fieldName.
 
     \code
-    QJNIObject volumeControll = ...;
+    QAndroidJniObject volumeControll = ...;
     jint fieldValue = obj.getField<jint>("MAX_VOLUME");
     \endcode
 */
 
 /*!
-    \fn QJNIObject QJNIObject::getObjectField(const char *fieldName) const
+    \fn QAndroidJniObject QAndroidJniObject::getObjectField(const char *fieldName) const
 
     Retrieves the object of field \a fieldName.
 */
 
 /*!
-    \fn QJNIObject QJNIObject::getObjectField(const char *fieldName, const char *signature) const
+    \fn QAndroidJniObject QAndroidJniObject::getObjectField(const char *fieldName, const char *signature) const
 
     Retrieves the object from the field with \a signature and \a fieldName.
 */
 
 /*!
-    \fn T QJNIObject::getStaticField(const char *className, const char *fieldName)
+    \fn T QAndroidJniObject::getStaticField(const char *className, const char *fieldName)
 
     Retrieves the value from the static field \a fieldName on the class \a className.
 */
 
 /*!
-    \fn T QJNIObject::getStaticField(jclass clazz, const char *fieldName)
+    \fn T QAndroidJniObject::getStaticField(jclass clazz, const char *fieldName)
 
     Retrieves the value from the static field \a fieldName on \a clazz.
 */
 
 /*!
-    \fn QJNIObject QJNIObject::getStaticObjectField(const char *className, const char *fieldName)
+    \fn QAndroidJniObject QAndroidJniObject::getStaticObjectField(const char *className, const char *fieldName)
 
     Retrieves the object from the field \a fieldName on the class \a className.
 */
 
 /*!
-    \fn QJNIObject QJNIObject::getStaticObjectField(const char *className, const char *fieldName, const char *signature)
+    \fn QAndroidJniObject QAndroidJniObject::getStaticObjectField(const char *className, const char *fieldName, const char *signature)
 
     Retrieves the object from the field with \a signature and \a fieldName on class \a className.
 */
 
 /*!
-    \fn QJNIObject QJNIObject::getStaticObjectField(jclass clazz, const char *fieldName)
+    \fn QAndroidJniObject QAndroidJniObject::getStaticObjectField(jclass clazz, const char *fieldName)
 
     Retrieves the object from the field \a fieldName on \a clazz.
 */
 
 /*!
-    \fn QJNIObject QJNIObject::getStaticObjectField(jclass clazz, const char *fieldName, const char *signature)
+    \fn QAndroidJniObject QAndroidJniObject::getStaticObjectField(jclass clazz, const char *fieldName, const char *signature)
 
     Retrieves the object from the field with \a signature and \a fieldName on \a clazz.
 */
 
 /*!
-    \fn void QJNIObject::setField(const char *fieldName, T value)
+    \fn void QAndroidJniObject::setField(const char *fieldName, T value)
 
     Sets the value of \a fieldName to \a value.
 
     \code
     ...
-    QJNIObject obj;
+    QAndroidJniObject obj;
     obj.setField<jint>("AN_INT_FIELD", 10);
     jstring myString = ...
     obj.setField<jstring>("A_STRING_FIELD", myString);
@@ -387,49 +387,49 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn void QJNIObject::setField(const char *fieldName, const char *signature, T value)
+    \fn void QAndroidJniObject::setField(const char *fieldName, const char *signature, T value)
 
     Sets the value of \a fieldName with \a signature to \a value.
 
     \code
-    QJNIObject stringArray = ...;
-    QJNIObject obj = ...;
+    QAndroidJniObject stringArray = ...;
+    QAndroidJniObject obj = ...;
     obj.setField<jobjectArray>("KEY_VALUES", "([Ljava/lang/String;)V", stringArray.object<jobjectArray>())
     \endcode
 */
 
 /*!
-    \fn void QJNIObject::setStaticField(const char *className, const char *fieldName, T value)
+    \fn void QAndroidJniObject::setStaticField(const char *className, const char *fieldName, T value)
 
     Sets the value of the static field \a fieldName in class \a className to \a value.
 */
 
 /*!
-    \fn void QJNIObject::setStaticField(const char *className, const char *fieldName, const char *signature, T value);
+    \fn void QAndroidJniObject::setStaticField(const char *className, const char *fieldName, const char *signature, T value);
 
     Sets the static field with \a fieldName and \a signature to \a value on class \a className.
 */
 
 /*!
-    \fn void QJNIObject::setStaticField(jclass clazz, const char *fieldName, T value)
+    \fn void QAndroidJniObject::setStaticField(jclass clazz, const char *fieldName, T value)
 
     Sets the static field \a fieldName of the class \a clazz to \a value.
 */
 
 /*!
-    \fn void QJNIObject::setStaticField(jclass clazz, const char *fieldName, const char *signature, T value);
+    \fn void QAndroidJniObject::setStaticField(jclass clazz, const char *fieldName, const char *signature, T value);
 
     Sets the static field with \a fieldName and \a signature to \a value on class \a clazz.
 */
 
 /*!
-    \fn bool QJNIObject::isClassAvailable(const char *className)
+    \fn bool QAndroidJniObject::isClassAvailable(const char *className)
 
     Returns true if the Java class \a className is available.
 
     \code
     ...
-    if (QJNIObject::isClassAvailable("java/lang/String")) {
+    if (QAndroidJniObject::isClassAvailable("java/lang/String")) {
        ...
     }
     ...
@@ -437,51 +437,51 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn bool QJNIObject::isValid() const
+    \fn bool QAndroidJniObject::isValid() const
 
     Returns true if this instance holds a valid Java object.
 
     \code
     ...
-    QJNIObject qjniObject;                        ==> isValid() == false
-    QJNIObject qjniObject(0)                      ==> isValid() == false
-    QJNIObject qjniObject("could/not/find/Class") ==> isValid() == false
+    QAndroidJniObject qjniObject;                        ==> isValid() == false
+    QAndroidJniObject qjniObject(0)                      ==> isValid() == false
+    QAndroidJniObject qjniObject("could/not/find/Class") ==> isValid() == false
     ...
     \endcode
 */
 
 /*!
-    \fn T QJNIObject::object() const
+    \fn T QAndroidJniObject::object() const
 
     Returns a jobject as type T.
 
     \code
-    QJNIObject string = QJNIObject::fromString("Hello, JNI");
+    QAndroidJniObject string = QAndroidJniObject::fromString("Hello, JNI");
     jstring jstring = string.object<jstring>();
     \endcode
 
-    Note that the jobject is still owned by the QJNIObject. If you want to keep the jobject valid
-    you should create a new QJNIObject or make a new global reference to the jobject and
+    Note that the jobject is still owned by the QAndroidJniObject. If you want to keep the jobject valid
+    you should create a new QAndroidJniObject or make a new global reference to the jobject and
     free it yourself.
 
-    \snippet code/src_androidextras_qjniobject.cpp QJNIObject scope
+    \snippet code/src_androidextras_qandroidjniobject.cpp QAndroidJniObject scope
 */
 
 /*!
-    \fn QJNIObject &QJNIObject::operator=(T object)
+    \fn QAndroidJniObject &QAndroidJniObject::operator=(T object)
 
     Replace the current object with \a object. The old Java object will be released.
 */
 
 /*!
-    \fn QString QJNIObject::toString() const
+    \fn QString QAndroidJniObject::toString() const
 
     Returns a QString with a string representation of the java object.
     Calling this function on a Java String object is a convenient way of getting the actuall string
     data.
 
     \code
-    QJNIObject string = ...; //  "Hello Java"
+    QAndroidJniObject string = ...; //  "Hello Java"
     QString qstring = string.toString(); // "Hello Java"
     \endcode
 
@@ -489,14 +489,14 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn QJNIObject QJNIObject::fromString(const QString &string)
+    \fn QAndroidJniObject QAndroidJniObject::fromString(const QString &string)
 
-    Creates a Java string from the QString \a string and returns a QJNIObject holding that string.
+    Creates a Java string from the QString \a string and returns a QAndroidJniObject holding that string.
 
     \code
     ...
     QString myQString = "QString";
-    QJNIObject myJavaString = QJNIObject::fromString(myQString);
+    QAndroidJniObject myJavaString = QAndroidJniObject::fromString(myQString);
     ...
     \endcode
 
@@ -504,52 +504,52 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn bool operator==(const QJNIObject &o1, const QJNIObject &o2)
-    \relates QJNIObject
+    \fn bool operator==(const QAndroidJniObject &o1, const QAndroidJniObject &o2)
+    \relates QAndroidJniObject
 
     Returns true if both objects, \a o1 and \a o2, are referencing the same Java object, or if both
     are NULL. In any other cases false will be returned.
 */
 
 /*!
-    \fn bool operator==(const QJNIObject &o1, T o2)
-    \relates QJNIObject
+    \fn bool operator==(const QAndroidJniObject &o1, T o2)
+    \relates QAndroidJniObject
 
     Returns true if both objects, \a o1 and \a o2, are referencing the same Java object, or if both
     are NULL. In any other cases false will be returned.
 */
 
 /*!
-    \fn bool operator==(T o1, const QJNIObject &o2)
-    \relates QJNIObject
+    \fn bool operator==(T o1, const QAndroidJniObject &o2)
+    \relates QAndroidJniObject
 
     Returns true if both objects, \a o1 and \a o2, are referencing the same Java object, or if both
     are NULL. In any other cases false will be returned.
 */
 
 /*!
-    \fn bool operator!=(const QJNIObject &o1, const QJNIObject &o2)
-    \relates QJNIObject
+    \fn bool operator!=(const QAndroidJniObject &o1, const QAndroidJniObject &o2)
+    \relates QAndroidJniObject
 
     Returns true if \a o1 holds a reference to a different object then \a o2.
 */
 
 /*!
-    \fn bool operator!=(const QJNIObject &o1, T o2)
-    \relates QJNIObject
+    \fn bool operator!=(const QAndroidJniObject &o1, T o2)
+    \relates QAndroidJniObject
 
     Returns true if \a o1 holds a reference to a different object then \a o2.
 */
 
 /*!
-    \fn bool operator!=(T o1, const QJNIObject &o2)
-    \relates QJNIObject
+    \fn bool operator!=(T o1, const QAndroidJniObject &o2)
+    \relates QAndroidJniObject
 
     Returns true if \a o1 is referencing a different object then \a o2.
 */
 
 
-QJNIObject::QJNIObject(const char *className, const char *sig, ...)
+QAndroidJniObject::QAndroidJniObject(const char *className, const char *sig, ...)
 {
     va_list args;
     va_start(args, sig);
@@ -557,7 +557,7 @@ QJNIObject::QJNIObject(const char *className, const char *sig, ...)
     va_end(args);
 }
 
-QJNIObject::QJNIObject(jclass clazz, const char *sig, ...)
+QAndroidJniObject::QAndroidJniObject(jclass clazz, const char *sig, ...)
 {
     va_list args;
     va_start(args, sig);
@@ -566,30 +566,30 @@ QJNIObject::QJNIObject(jclass clazz, const char *sig, ...)
 }
 
 
-QJNIObject::QJNIObject() : d(new QJNIObjectPrivate)
+QAndroidJniObject::QAndroidJniObject() : d(new QJNIObjectPrivate)
 {
 
 }
 
-QJNIObject::QJNIObject(const char *className) : d(new QJNIObjectPrivate(className))
+QAndroidJniObject::QAndroidJniObject(const char *className) : d(new QJNIObjectPrivate(className))
 {
 }
 
-QJNIObject::QJNIObject(jclass clazz) : d(new QJNIObjectPrivate(clazz))
+QAndroidJniObject::QAndroidJniObject(jclass clazz) : d(new QJNIObjectPrivate(clazz))
 {
 }
 
-QJNIObject::QJNIObject(jobject obj) : d(new QJNIObjectPrivate(obj))
+QAndroidJniObject::QAndroidJniObject(jobject obj) : d(new QJNIObjectPrivate(obj))
 {
 }
 
-QJNIObject::QJNIObject(const QJNIObjectPrivate &o) : d(new QJNIObjectPrivate(o))
+QAndroidJniObject::QAndroidJniObject(const QJNIObjectPrivate &o) : d(new QJNIObjectPrivate(o))
 {
 
 }
 
 template <>
-void QJNIObject::callMethod<void>(const char *methodName, const char *sig, ...) const
+void QAndroidJniObject::callMethod<void>(const char *methodName, const char *sig, ...) const
 {
     va_list args;
     va_start(args, sig);
@@ -598,7 +598,7 @@ void QJNIObject::callMethod<void>(const char *methodName, const char *sig, ...)
 }
 
 template <>
-jboolean QJNIObject::callMethod<jboolean>(const char *methodName, const char *sig, ...) const
+jboolean QAndroidJniObject::callMethod<jboolean>(const char *methodName, const char *sig, ...) const
 {
     va_list args;
     va_start(args, sig);
@@ -608,7 +608,7 @@ jboolean QJNIObject::callMethod<jboolean>(const char *methodName, const char *si
 }
 
 template <>
-jbyte QJNIObject::callMethod<jbyte>(const char *methodName, const char *sig, ...) const
+jbyte QAndroidJniObject::callMethod<jbyte>(const char *methodName, const char *sig, ...) const
 {
     va_list args;
     va_start(args, sig);
@@ -618,7 +618,7 @@ jbyte QJNIObject::callMethod<jbyte>(const char *methodName, const char *sig, ...
 }
 
 template <>
-jchar QJNIObject::callMethod<jchar>(const char *methodName, const char *sig, ...) const
+jchar QAndroidJniObject::callMethod<jchar>(const char *methodName, const char *sig, ...) const
 {
     va_list args;
     va_start(args, sig);
@@ -628,7 +628,7 @@ jchar QJNIObject::callMethod<jchar>(const char *methodName, const char *sig, ...
 }
 
 template <>
-jshort QJNIObject::callMethod<jshort>(const char *methodName, const char *sig, ...) const
+jshort QAndroidJniObject::callMethod<jshort>(const char *methodName, const char *sig, ...) const
 {
     va_list args;
     va_start(args, sig);
@@ -638,7 +638,7 @@ jshort QJNIObject::callMethod<jshort>(const char *methodName, const char *sig, .
 }
 
 template <>
-jint QJNIObject::callMethod<jint>(const char *methodName, const char *sig, ...) const
+jint QAndroidJniObject::callMethod<jint>(const char *methodName, const char *sig, ...) const
 {
     va_list args;
     va_start(args, sig);
@@ -648,7 +648,7 @@ jint QJNIObject::callMethod<jint>(const char *methodName, const char *sig, ...)
 }
 
 template <>
-jlong QJNIObject::callMethod<jlong>(const char *methodName, const char *sig, ...) const
+jlong QAndroidJniObject::callMethod<jlong>(const char *methodName, const char *sig, ...) const
 {
     va_list args;
     va_start(args, sig);
@@ -658,7 +658,7 @@ jlong QJNIObject::callMethod<jlong>(const char *methodName, const char *sig, ...
 }
 
 template <>
-jfloat QJNIObject::callMethod<jfloat>(const char *methodName, const char *sig, ...) const
+jfloat QAndroidJniObject::callMethod<jfloat>(const char *methodName, const char *sig, ...) const
 {
     va_list args;
     va_start(args, sig);
@@ -668,7 +668,7 @@ jfloat QJNIObject::callMethod<jfloat>(const char *methodName, const char *sig, .
 }
 
 template <>
-jdouble QJNIObject::callMethod<jdouble>(const char *methodName, const char *sig, ...) const
+jdouble QAndroidJniObject::callMethod<jdouble>(const char *methodName, const char *sig, ...) const
 {
     va_list args;
     va_start(args, sig);
@@ -677,7 +677,7 @@ jdouble QJNIObject::callMethod<jdouble>(const char *methodName, const char *sig,
     return res;
 }
 
-QJNIObject QJNIObject::callObjectMethod(const char *methodName,
+QAndroidJniObject QAndroidJniObject::callObjectMethod(const char *methodName,
                                         const char *sig,
                                         ...) const
 {
@@ -689,109 +689,109 @@ QJNIObject QJNIObject::callObjectMethod(const char *methodName,
 }
 
 template <>
-void QJNIObject::callMethod<void>(const char *methodName) const
+void QAndroidJniObject::callMethod<void>(const char *methodName) const
 {
     callMethod<void>(methodName, "()V");
 }
 
 template <>
-jboolean QJNIObject::callMethod<jboolean>(const char *methodName) const
+jboolean QAndroidJniObject::callMethod<jboolean>(const char *methodName) const
 {
     return callMethod<jboolean>(methodName, "()Z");
 }
 
 template <>
-jbyte QJNIObject::callMethod<jbyte>(const char *methodName) const
+jbyte QAndroidJniObject::callMethod<jbyte>(const char *methodName) const
 {
     return callMethod<jbyte>(methodName, "()B");
 }
 
 template <>
-jchar QJNIObject::callMethod<jchar>(const char *methodName) const
+jchar QAndroidJniObject::callMethod<jchar>(const char *methodName) const
 {
     return callMethod<jchar>(methodName, "()C");
 }
 
 template <>
-jshort QJNIObject::callMethod<jshort>(const char *methodName) const
+jshort QAndroidJniObject::callMethod<jshort>(const char *methodName) const
 {
     return callMethod<jshort>(methodName, "()S");
 }
 
 template <>
-jint QJNIObject::callMethod<jint>(const char *methodName) const
+jint QAndroidJniObject::callMethod<jint>(const char *methodName) const
 {
     return callMethod<jint>(methodName, "()I");
 }
 
 template <>
-jlong QJNIObject::callMethod<jlong>(const char *methodName) const
+jlong QAndroidJniObject::callMethod<jlong>(const char *methodName) const
 {
     return callMethod<jlong>(methodName, "()J");
 }
 
 template <>
-jfloat QJNIObject::callMethod<jfloat>(const char *methodName) const
+jfloat QAndroidJniObject::callMethod<jfloat>(const char *methodName) const
 {
     return callMethod<jfloat>(methodName, "()F");
 }
 
 template <>
-jdouble QJNIObject::callMethod<jdouble>(const char *methodName) const
+jdouble QAndroidJniObject::callMethod<jdouble>(const char *methodName) const
 {
     return callMethod<jdouble>(methodName, "()D");
 }
 
 template <>
-QJNIObject QJNIObject::callObjectMethod<jstring>(const char *methodName) const
+QAndroidJniObject QAndroidJniObject::callObjectMethod<jstring>(const char *methodName) const
 {
     return d->callObjectMethod(methodName, "()Ljava/lang/String;");
 }
 
 template <>
-QJNIObject QJNIObject::callObjectMethod<jbooleanArray>(const char *methodName) const
+QAndroidJniObject QAndroidJniObject::callObjectMethod<jbooleanArray>(const char *methodName) const
 {
     return d->callObjectMethod(methodName, "()[Z");
 }
 
 template <>
-QJNIObject QJNIObject::callObjectMethod<jbyteArray>(const char *methodName) const
+QAndroidJniObject QAndroidJniObject::callObjectMethod<jbyteArray>(const char *methodName) const
 {
     return d->callObjectMethod(methodName, "()[B");
 }
 
 template <>
-QJNIObject QJNIObject::callObjectMethod<jshortArray>(const char *methodName) const
+QAndroidJniObject QAndroidJniObject::callObjectMethod<jshortArray>(const char *methodName) const
 {
     return d->callObjectMethod(methodName, "()[S");
 }
 
 template <>
-QJNIObject QJNIObject::callObjectMethod<jintArray>(const char *methodName) const
+QAndroidJniObject QAndroidJniObject::callObjectMethod<jintArray>(const char *methodName) const
 {
     return d->callObjectMethod(methodName, "()[I");
 }
 
 template <>
-QJNIObject QJNIObject::callObjectMethod<jlongArray>(const char *methodName) const
+QAndroidJniObject QAndroidJniObject::callObjectMethod<jlongArray>(const char *methodName) const
 {
     return d->callObjectMethod(methodName, "()[J");
 }
 
 template <>
-QJNIObject QJNIObject::callObjectMethod<jfloatArray>(const char *methodName) const
+QAndroidJniObject QAndroidJniObject::callObjectMethod<jfloatArray>(const char *methodName) const
 {
     return d->callObjectMethod(methodName, "()[F");
 }
 
 template <>
-QJNIObject QJNIObject::callObjectMethod<jdoubleArray>(const char *methodName) const
+QAndroidJniObject QAndroidJniObject::callObjectMethod<jdoubleArray>(const char *methodName) const
 {
     return d->callObjectMethod(methodName, "()[D");
 }
 
 template <>
-void QJNIObject::callStaticMethod<void>(const char *className,
+void QAndroidJniObject::callStaticMethod<void>(const char *className,
                                         const char *methodName,
                                         const char *sig,
                                         ...)
@@ -803,7 +803,7 @@ void QJNIObject::callStaticMethod<void>(const char *className,
 }
 
 template <>
-void QJNIObject::callStaticMethod<void>(jclass clazz,
+void QAndroidJniObject::callStaticMethod<void>(jclass clazz,
                                         const char *methodName,
                                         const char *sig,
                                         ...)
@@ -815,7 +815,7 @@ void QJNIObject::callStaticMethod<void>(jclass clazz,
 }
 
 template <>
-jboolean QJNIObject::callStaticMethod<jboolean>(const char *className,
+jboolean QAndroidJniObject::callStaticMethod<jboolean>(const char *className,
                                                 const char *methodName,
                                                 const char *sig,
                                                 ...)
@@ -828,7 +828,7 @@ jboolean QJNIObject::callStaticMethod<jboolean>(const char *className,
 }
 
 template <>
-jboolean QJNIObject::callStaticMethod<jboolean>(jclass clazz,
+jboolean QAndroidJniObject::callStaticMethod<jboolean>(jclass clazz,
                                                 const char *methodName,
                                                 const char *sig,
                                                 ...)
@@ -841,7 +841,7 @@ jboolean QJNIObject::callStaticMethod<jboolean>(jclass clazz,
 }
 
 template <>
-jbyte QJNIObject::callStaticMethod<jbyte>(const char *className,
+jbyte QAndroidJniObject::callStaticMethod<jbyte>(const char *className,
                                           const char *methodName,
                                           const char *sig,
                                           ...)
@@ -854,7 +854,7 @@ jbyte QJNIObject::callStaticMethod<jbyte>(const char *className,
 }
 
 template <>
-jbyte QJNIObject::callStaticMethod<jbyte>(jclass clazz,
+jbyte QAndroidJniObject::callStaticMethod<jbyte>(jclass clazz,
                                           const char *methodName,
                                           const char *sig,
                                           ...)
@@ -867,7 +867,7 @@ jbyte QJNIObject::callStaticMethod<jbyte>(jclass clazz,
 }
 
 template <>
-jchar QJNIObject::callStaticMethod<jchar>(const char *className,
+jchar QAndroidJniObject::callStaticMethod<jchar>(const char *className,
                                           const char *methodName,
                                           const char *sig,
                                           ...)
@@ -880,7 +880,7 @@ jchar QJNIObject::callStaticMethod<jchar>(const char *className,
 }
 
 template <>
-jchar QJNIObject::callStaticMethod<jchar>(jclass clazz,
+jchar QAndroidJniObject::callStaticMethod<jchar>(jclass clazz,
                                           const char *methodName,
                                           const char *sig,
                                           ...)
@@ -894,7 +894,7 @@ jchar QJNIObject::callStaticMethod<jchar>(jclass clazz,
 
 
 template <>
-jshort QJNIObject::callStaticMethod<jshort>(const char *className,
+jshort QAndroidJniObject::callStaticMethod<jshort>(const char *className,
                                             const char *methodName,
                                             const char *sig,
                                             ...)
@@ -907,7 +907,7 @@ jshort QJNIObject::callStaticMethod<jshort>(const char *className,
 }
 
 template <>
-jshort QJNIObject::callStaticMethod<jshort>(jclass clazz,
+jshort QAndroidJniObject::callStaticMethod<jshort>(jclass clazz,
                                             const char *methodName,
                                             const char *sig,
                                             ...)
@@ -920,7 +920,7 @@ jshort QJNIObject::callStaticMethod<jshort>(jclass clazz,
 }
 
 template <>
-jint QJNIObject::callStaticMethod<jint>(const char *className,
+jint QAndroidJniObject::callStaticMethod<jint>(const char *className,
                                         const char *methodName,
                                         const char *sig,
                                         ...)
@@ -933,7 +933,7 @@ jint QJNIObject::callStaticMethod<jint>(const char *className,
 }
 
 template <>
-jint QJNIObject::callStaticMethod<jint>(jclass clazz,
+jint QAndroidJniObject::callStaticMethod<jint>(jclass clazz,
                                         const char *methodName,
                                         const char *sig,
                                         ...)
@@ -946,7 +946,7 @@ jint QJNIObject::callStaticMethod<jint>(jclass clazz,
 }
 
 template <>
-jlong QJNIObject::callStaticMethod<jlong>(const char *className,
+jlong QAndroidJniObject::callStaticMethod<jlong>(const char *className,
                                           const char *methodName,
                                           const char *sig,
                                           ...)
@@ -959,7 +959,7 @@ jlong QJNIObject::callStaticMethod<jlong>(const char *className,
 }
 
 template <>
-jlong QJNIObject::callStaticMethod<jlong>(jclass clazz,
+jlong QAndroidJniObject::callStaticMethod<jlong>(jclass clazz,
                                           const char *methodName,
                                           const char *sig,
                                           ...)
@@ -972,7 +972,7 @@ jlong QJNIObject::callStaticMethod<jlong>(jclass clazz,
 }
 
 template <>
-jfloat QJNIObject::callStaticMethod<jfloat>(const char *className,
+jfloat QAndroidJniObject::callStaticMethod<jfloat>(const char *className,
                                             const char *methodName,
                                             const char *sig,
                                             ...)
@@ -985,7 +985,7 @@ jfloat QJNIObject::callStaticMethod<jfloat>(const char *className,
 }
 
 template <>
-jfloat QJNIObject::callStaticMethod<jfloat>(jclass clazz,
+jfloat QAndroidJniObject::callStaticMethod<jfloat>(jclass clazz,
                                             const char *methodName,
                                             const char *sig,
                                             ...)
@@ -998,7 +998,7 @@ jfloat QJNIObject::callStaticMethod<jfloat>(jclass clazz,
 }
 
 template <>
-jdouble QJNIObject::callStaticMethod<jdouble>(const char *className,
+jdouble QAndroidJniObject::callStaticMethod<jdouble>(const char *className,
                                               const char *methodName,
                                               const char *sig,
                                               ...)
@@ -1011,7 +1011,7 @@ jdouble QJNIObject::callStaticMethod<jdouble>(const char *className,
 }
 
 template <>
-jdouble QJNIObject::callStaticMethod<jdouble>(jclass clazz,
+jdouble QAndroidJniObject::callStaticMethod<jdouble>(jclass clazz,
                                               const char *methodName,
                                               const char *sig,
                                               ...)
@@ -1023,7 +1023,7 @@ jdouble QJNIObject::callStaticMethod<jdouble>(jclass clazz,
     return res;
 }
 
-QJNIObject QJNIObject::callStaticObjectMethod(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod(const char *className,
                                               const char *methodName,
                                               const char *sig,
                                               ...)
@@ -1038,7 +1038,7 @@ QJNIObject QJNIObject::callStaticObjectMethod(const char *className,
     return res;
 }
 
-QJNIObject QJNIObject::callStaticObjectMethod(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod(jclass clazz,
                                               const char *methodName,
                                               const char *sig,
                                               ...)
@@ -1051,458 +1051,458 @@ QJNIObject QJNIObject::callStaticObjectMethod(jclass clazz,
 }
 
 template <>
-void QJNIObject::callStaticMethod<void>(const char *className, const char *methodName)
+void QAndroidJniObject::callStaticMethod<void>(const char *className, const char *methodName)
 {
     callStaticMethod<void>(className, methodName, "()V");
 }
 
 template <>
-void QJNIObject::callStaticMethod<void>(jclass clazz, const char *methodName)
+void QAndroidJniObject::callStaticMethod<void>(jclass clazz, const char *methodName)
 {
     callStaticMethod<void>(clazz, methodName, "()V");
 }
 
 template <>
-jboolean QJNIObject::callStaticMethod<jboolean>(const char *className, const char *methodName)
+jboolean QAndroidJniObject::callStaticMethod<jboolean>(const char *className, const char *methodName)
 {
     return callStaticMethod<jboolean>(className, methodName, "()Z");
 }
 
 template <>
-jboolean QJNIObject::callStaticMethod<jboolean>(jclass clazz, const char *methodName)
+jboolean QAndroidJniObject::callStaticMethod<jboolean>(jclass clazz, const char *methodName)
 {
     return callStaticMethod<jboolean>(clazz, methodName, "()Z");
 }
 
 template <>
-jbyte QJNIObject::callStaticMethod<jbyte>(const char *className, const char *methodName)
+jbyte QAndroidJniObject::callStaticMethod<jbyte>(const char *className, const char *methodName)
 {
     return callStaticMethod<jbyte>(className, methodName, "()B");
 }
 
 template <>
-jbyte QJNIObject::callStaticMethod<jbyte>(jclass clazz, const char *methodName)
+jbyte QAndroidJniObject::callStaticMethod<jbyte>(jclass clazz, const char *methodName)
 {
     return callStaticMethod<jbyte>(clazz, methodName, "()B");
 }
 
 template <>
-jchar QJNIObject::callStaticMethod<jchar>(const char *className, const char *methodName)
+jchar QAndroidJniObject::callStaticMethod<jchar>(const char *className, const char *methodName)
 {
     return callStaticMethod<jchar>(className, methodName, "()C");
 }
 
 template <>
-jchar QJNIObject::callStaticMethod<jchar>(jclass clazz, const char *methodName)
+jchar QAndroidJniObject::callStaticMethod<jchar>(jclass clazz, const char *methodName)
 {
     return callStaticMethod<jchar>(clazz, methodName, "()C");
 }
 
 template <>
-jshort QJNIObject::callStaticMethod<jshort>(const char *className, const char *methodName)
+jshort QAndroidJniObject::callStaticMethod<jshort>(const char *className, const char *methodName)
 {
     return callStaticMethod<jshort>(className, methodName, "()S");
 }
 
 template <>
-jshort QJNIObject::callStaticMethod<jshort>(jclass clazz, const char *methodName)
+jshort QAndroidJniObject::callStaticMethod<jshort>(jclass clazz, const char *methodName)
 {
     return callStaticMethod<jshort>(clazz, methodName, "()S");
 }
 
 template <>
-jint QJNIObject::callStaticMethod<jint>(const char *className, const char *methodName)
+jint QAndroidJniObject::callStaticMethod<jint>(const char *className, const char *methodName)
 {
     return callStaticMethod<jint>(className, methodName, "()I");
 }
 
 template <>
-jint QJNIObject::callStaticMethod<jint>(jclass clazz, const char *methodName)
+jint QAndroidJniObject::callStaticMethod<jint>(jclass clazz, const char *methodName)
 {
     return callStaticMethod<jint>(clazz, methodName, "()I");
 }
 
 template <>
-jlong QJNIObject::callStaticMethod<jlong>(const char *className, const char *methodName)
+jlong QAndroidJniObject::callStaticMethod<jlong>(const char *className, const char *methodName)
 {
     return callStaticMethod<jlong>(className, methodName, "()J");
 }
 
 template <>
-jlong QJNIObject::callStaticMethod<jlong>(jclass clazz, const char *methodName)
+jlong QAndroidJniObject::callStaticMethod<jlong>(jclass clazz, const char *methodName)
 {
     return callStaticMethod<jlong>(clazz, methodName, "()J");
 }
 
 template <>
-jfloat QJNIObject::callStaticMethod<jfloat>(const char *className, const char *methodName)
+jfloat QAndroidJniObject::callStaticMethod<jfloat>(const char *className, const char *methodName)
 {
     return callStaticMethod<jfloat>(className, methodName, "()F");
 }
 
 template <>
-jfloat QJNIObject::callStaticMethod<jfloat>(jclass clazz, const char *methodName)
+jfloat QAndroidJniObject::callStaticMethod<jfloat>(jclass clazz, const char *methodName)
 {
     return callStaticMethod<jfloat>(clazz, methodName, "()F");
 }
 
 template <>
-jdouble QJNIObject::callStaticMethod<jdouble>(const char *className, const char *methodName)
+jdouble QAndroidJniObject::callStaticMethod<jdouble>(const char *className, const char *methodName)
 {
     return callStaticMethod<jdouble>(className, methodName, "()D");
 }
 
 template <>
-jdouble QJNIObject::callStaticMethod<jdouble>(jclass clazz, const char *methodName)
+jdouble QAndroidJniObject::callStaticMethod<jdouble>(jclass clazz, const char *methodName)
 {
     return callStaticMethod<jdouble>(clazz, methodName, "()D");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jstring>(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jstring>(const char *className,
                                                        const char *methodName)
 {
     return callStaticObjectMethod(className, methodName, "()Ljava/lang/String;");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jstring>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jstring>(jclass clazz,
                                                        const char *methodName)
 {
     return callStaticObjectMethod(clazz, methodName, "()Ljava/lang/String;");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jbooleanArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jbooleanArray>(const char *className,
                                                              const char *methodName)
 {
     return callStaticObjectMethod(className, methodName, "()[Z");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jbooleanArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jbooleanArray>(jclass clazz,
                                                              const char *methodName)
 {
     return callStaticObjectMethod(clazz, methodName, "()[Z");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jbyteArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jbyteArray>(const char *className,
                                                           const char *methodName)
 {
     return callStaticObjectMethod(className, methodName, "()[B");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jbyteArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jbyteArray>(jclass clazz,
                                                           const char *methodName)
 {
     return callStaticObjectMethod(clazz, methodName, "()[B");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jcharArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jcharArray>(const char *className,
                                                           const char *methodName)
 {
     return callStaticObjectMethod(className, methodName, "()[C");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jcharArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jcharArray>(jclass clazz,
                                                           const char *methodName)
 {
     return callStaticObjectMethod(clazz, methodName, "()[C");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jshortArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jshortArray>(const char *className,
                                                            const char *methodName)
 {
     return callStaticObjectMethod(className, methodName, "()[S");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jshortArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jshortArray>(jclass clazz,
                                                            const char *methodName)
 {
     return callStaticObjectMethod(clazz, methodName, "()[S");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jintArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jintArray>(const char *className,
                                                          const char *methodName)
 {
     return callStaticObjectMethod(className, methodName, "()[I");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jintArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jintArray>(jclass clazz,
                                                          const char *methodName)
 {
     return callStaticObjectMethod(clazz, methodName, "()[I");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jlongArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jlongArray>(const char *className,
                                                           const char *methodName)
 {
     return callStaticObjectMethod(className, methodName, "()[J");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jlongArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jlongArray>(jclass clazz,
                                                           const char *methodName)
 {
     return callStaticObjectMethod(clazz, methodName, "()[J");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jfloatArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jfloatArray>(const char *className,
                                                            const char *methodName)
 {
     return callStaticObjectMethod(className, methodName, "()[F");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jfloatArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jfloatArray>(jclass clazz,
                                                            const char *methodName)
 {
     return callStaticObjectMethod(clazz, methodName, "()[F");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jdoubleArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jdoubleArray>(const char *className,
                                                             const char *methodName)
 {
     return callStaticObjectMethod(className, methodName, "()[D");
 }
 
 template <>
-QJNIObject QJNIObject::callStaticObjectMethod<jdoubleArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::callStaticObjectMethod<jdoubleArray>(jclass clazz,
                                                             const char *methodName)
 {
     return callStaticObjectMethod(clazz, methodName, "()[D");
 }
 
 template <>
-jboolean QJNIObject::getField<jboolean>(const char *fieldName) const
+jboolean QAndroidJniObject::getField<jboolean>(const char *fieldName) const
 {
     return d->getField<jboolean>(fieldName);
 }
 
 template <>
-jbyte QJNIObject::getField<jbyte>(const char *fieldName) const
+jbyte QAndroidJniObject::getField<jbyte>(const char *fieldName) const
 {
     return d->getField<jbyte>(fieldName);
 }
 
 template <>
-jchar QJNIObject::getField<jchar>(const char *fieldName) const
+jchar QAndroidJniObject::getField<jchar>(const char *fieldName) const
 {
     return d->getField<jchar>(fieldName);
 }
 
 template <>
-jshort QJNIObject::getField<jshort>(const char *fieldName) const
+jshort QAndroidJniObject::getField<jshort>(const char *fieldName) const
 {
     return d->getField<jshort>(fieldName);
 }
 
 template <>
-jint QJNIObject::getField<jint>(const char *fieldName) const
+jint QAndroidJniObject::getField<jint>(const char *fieldName) const
 {
     return d->getField<jint>(fieldName);
 }
 
 template <>
-jlong QJNIObject::getField<jlong>(const char *fieldName) const
+jlong QAndroidJniObject::getField<jlong>(const char *fieldName) const
 {
     return d->getField<jlong>(fieldName);
 }
 
 template <>
-jfloat QJNIObject::getField<jfloat>(const char *fieldName) const
+jfloat QAndroidJniObject::getField<jfloat>(const char *fieldName) const
 {
     return d->getField<jfloat>(fieldName);
 }
 
 template <>
-jdouble QJNIObject::getField<jdouble>(const char *fieldName) const
+jdouble QAndroidJniObject::getField<jdouble>(const char *fieldName) const
 {
     return d->getField<jdouble>(fieldName);
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jobject>(const char *fieldName, const char *sig) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jobject>(const char *fieldName, const char *sig) const
 {
     return d->getObjectField(fieldName, sig);
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jbooleanArray>(const char *fieldName) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jbooleanArray>(const char *fieldName) const
 {
     return d->getObjectField(fieldName, "[Z");
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jbyteArray>(const char *fieldName) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jbyteArray>(const char *fieldName) const
 {
     return d->getObjectField(fieldName, "[B");
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jcharArray>(const char *fieldName) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jcharArray>(const char *fieldName) const
 {
     return d->getObjectField(fieldName, "[C");
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jshortArray>(const char *fieldName) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jshortArray>(const char *fieldName) const
 {
     return d->getObjectField(fieldName, "[S");
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jintArray>(const char *fieldName) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jintArray>(const char *fieldName) const
 {
     return d->getObjectField(fieldName, "[I");
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jlongArray>(const char *fieldName) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jlongArray>(const char *fieldName) const
 {
     return d->getObjectField(fieldName, "[J");
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jfloatArray>(const char *fieldName) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jfloatArray>(const char *fieldName) const
 {
     return d->getObjectField(fieldName, "[F");
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jdoubleArray>(const char *fieldName) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jdoubleArray>(const char *fieldName) const
 {
     return d->getObjectField(fieldName, "[D");
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jstring>(const char *fieldName) const
+QAndroidJniObject QAndroidJniObject::getObjectField<jstring>(const char *fieldName) const
 {
     return d->getObjectField(fieldName, "Ljava/lang/String;");
 }
 
 template <>
-QJNIObject QJNIObject::getObjectField<jobjectArray>(const char *fieldName,
+QAndroidJniObject QAndroidJniObject::getObjectField<jobjectArray>(const char *fieldName,
                                                     const char *sig) const
 {
     return d->getObjectField(fieldName, sig);
 }
 
 template <>
-void QJNIObject::setField<jboolean>(const char *fieldName, jboolean value)
+void QAndroidJniObject::setField<jboolean>(const char *fieldName, jboolean value)
 {
     d->setField<jboolean>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jbyte>(const char *fieldName, jbyte value)
+void QAndroidJniObject::setField<jbyte>(const char *fieldName, jbyte value)
 {
     d->setField<jbyte>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jchar>(const char *fieldName, jchar value)
+void QAndroidJniObject::setField<jchar>(const char *fieldName, jchar value)
 {
     d->setField<jchar>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jshort>(const char *fieldName, jshort value)
+void QAndroidJniObject::setField<jshort>(const char *fieldName, jshort value)
 {
     d->setField<jshort>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jint>(const char *fieldName, jint value)
+void QAndroidJniObject::setField<jint>(const char *fieldName, jint value)
 {
     d->setField<jint>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jlong>(const char *fieldName, jlong value)
+void QAndroidJniObject::setField<jlong>(const char *fieldName, jlong value)
 {
     d->setField<jlong>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jfloat>(const char *fieldName, jfloat value)
+void QAndroidJniObject::setField<jfloat>(const char *fieldName, jfloat value)
 {
     d->setField<jfloat>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jdouble>(const char *fieldName, jdouble value)
+void QAndroidJniObject::setField<jdouble>(const char *fieldName, jdouble value)
 {
     d->setField<jdouble>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jbooleanArray>(const char *fieldName, jbooleanArray value)
+void QAndroidJniObject::setField<jbooleanArray>(const char *fieldName, jbooleanArray value)
 {
     d->setField<jbooleanArray>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jbyteArray>(const char *fieldName, jbyteArray value)
+void QAndroidJniObject::setField<jbyteArray>(const char *fieldName, jbyteArray value)
 {
     d->setField<jbyteArray>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jcharArray>(const char *fieldName, jcharArray value)
+void QAndroidJniObject::setField<jcharArray>(const char *fieldName, jcharArray value)
 {
     d->setField<jcharArray>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jshortArray>(const char *fieldName, jshortArray value)
+void QAndroidJniObject::setField<jshortArray>(const char *fieldName, jshortArray value)
 {
     d->setField<jshortArray>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jintArray>(const char *fieldName, jintArray value)
+void QAndroidJniObject::setField<jintArray>(const char *fieldName, jintArray value)
 {
     d->setField<jintArray>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jlongArray>(const char *fieldName, jlongArray value)
+void QAndroidJniObject::setField<jlongArray>(const char *fieldName, jlongArray value)
 {
     d->setField<jlongArray>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jfloatArray>(const char *fieldName, jfloatArray value)
+void QAndroidJniObject::setField<jfloatArray>(const char *fieldName, jfloatArray value)
 {
     d->setField<jfloatArray>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jdoubleArray>(const char *fieldName, jdoubleArray value)
+void QAndroidJniObject::setField<jdoubleArray>(const char *fieldName, jdoubleArray value)
 {
     d->setField<jdoubleArray>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jstring>(const char *fieldName, jstring value)
+void QAndroidJniObject::setField<jstring>(const char *fieldName, jstring value)
 {
     d->setField<jstring>(fieldName, value);
 }
 
 template <>
-void QJNIObject::setField<jobject>(const char *fieldName,
+void QAndroidJniObject::setField<jobject>(const char *fieldName,
                                    const char *sig,
                                    jobject value)
 {
@@ -1510,7 +1510,7 @@ void QJNIObject::setField<jobject>(const char *fieldName,
 }
 
 template <>
-void QJNIObject::setField<jobjectArray>(const char *fieldName,
+void QAndroidJniObject::setField<jobjectArray>(const char *fieldName,
                                         const char *sig,
                                         jobjectArray value)
 {
@@ -1518,103 +1518,103 @@ void QJNIObject::setField<jobjectArray>(const char *fieldName,
 }
 
 template <>
-jboolean QJNIObject::getStaticField<jboolean>(jclass clazz, const char *fieldName)
+jboolean QAndroidJniObject::getStaticField<jboolean>(jclass clazz, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jboolean>(clazz, fieldName);
 }
 
 template <>
-jboolean QJNIObject::getStaticField<jboolean>(const char *className, const char *fieldName)
+jboolean QAndroidJniObject::getStaticField<jboolean>(const char *className, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jboolean>(className, fieldName);
 }
 
 template <>
-jbyte QJNIObject::getStaticField<jbyte>(jclass clazz, const char *fieldName)
+jbyte QAndroidJniObject::getStaticField<jbyte>(jclass clazz, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jbyte>(clazz, fieldName);
 }
 
 template <>
-jbyte QJNIObject::getStaticField<jbyte>(const char *className, const char *fieldName)
+jbyte QAndroidJniObject::getStaticField<jbyte>(const char *className, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jbyte>(className, fieldName);
 }
 
 template <>
-jchar QJNIObject::getStaticField<jchar>(jclass clazz, const char *fieldName)
+jchar QAndroidJniObject::getStaticField<jchar>(jclass clazz, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jchar>(clazz, fieldName);
 }
 
 template <>
-jchar QJNIObject::getStaticField<jchar>(const char *className, const char *fieldName)
+jchar QAndroidJniObject::getStaticField<jchar>(const char *className, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jchar>(className, fieldName);
 }
 
 template <>
-jshort QJNIObject::getStaticField<jshort>(jclass clazz, const char *fieldName)
+jshort QAndroidJniObject::getStaticField<jshort>(jclass clazz, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jshort>(clazz, fieldName);
 }
 
 template <>
-jshort QJNIObject::getStaticField<jshort>(const char *className, const char *fieldName)
+jshort QAndroidJniObject::getStaticField<jshort>(const char *className, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jshort>(className, fieldName);
 }
 
 template <>
-jint QJNIObject::getStaticField<jint>(jclass clazz, const char *fieldName)
+jint QAndroidJniObject::getStaticField<jint>(jclass clazz, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jint>(clazz, fieldName);
 }
 
 template <>
-jint QJNIObject::getStaticField<jint>(const char *className, const char *fieldName)
+jint QAndroidJniObject::getStaticField<jint>(const char *className, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jint>(className, fieldName);
 }
 
 template <>
-jlong QJNIObject::getStaticField<jlong>(jclass clazz, const char *fieldName)
+jlong QAndroidJniObject::getStaticField<jlong>(jclass clazz, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jlong>(clazz, fieldName);
 }
 
 template <>
-jlong QJNIObject::getStaticField<jlong>(const char *className, const char *fieldName)
+jlong QAndroidJniObject::getStaticField<jlong>(const char *className, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jlong>(className, fieldName);
 }
 
 template <>
-jfloat QJNIObject::getStaticField<jfloat>(jclass clazz, const char *fieldName)
+jfloat QAndroidJniObject::getStaticField<jfloat>(jclass clazz, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jfloat>(clazz, fieldName);
 }
 
 template <>
-jfloat QJNIObject::getStaticField<jfloat>(const char *className, const char *fieldName)
+jfloat QAndroidJniObject::getStaticField<jfloat>(const char *className, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jfloat>(className, fieldName);
 }
 
 template <>
-jdouble QJNIObject::getStaticField<jdouble>(jclass clazz, const char *fieldName)
+jdouble QAndroidJniObject::getStaticField<jdouble>(jclass clazz, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jdouble>(clazz, fieldName);
 }
 
 template <>
-jdouble QJNIObject::getStaticField<jdouble>(const char *className, const char *fieldName)
+jdouble QAndroidJniObject::getStaticField<jdouble>(const char *className, const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticField<jdouble>(className, fieldName);
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jobject>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jobject>(jclass clazz,
                                                      const char *fieldName,
                                                      const char *sig)
 {
@@ -1622,7 +1622,7 @@ QJNIObject QJNIObject::getStaticObjectField<jobject>(jclass clazz,
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jobject>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jobject>(const char *className,
                                                      const char *fieldName,
                                                      const char *sig)
 {
@@ -1630,133 +1630,133 @@ QJNIObject QJNIObject::getStaticObjectField<jobject>(const char *className,
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jstring>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jstring>(jclass clazz,
                                                      const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(clazz, fieldName, "Ljava/lang/String;");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jstring>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jstring>(const char *className,
                                                      const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(className, fieldName, "Ljava/lang/String;");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jbooleanArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jbooleanArray>(jclass clazz,
                                                            const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(clazz, fieldName, "[Z");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jbooleanArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jbooleanArray>(const char *className,
                                                            const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(className, fieldName, "[Z");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jbyteArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jbyteArray>(jclass clazz,
                                                         const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(clazz, fieldName, "[B");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jbyteArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jbyteArray>(const char *className,
                                                         const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(className, fieldName, "[B");;
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jcharArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jcharArray>(jclass clazz,
                                                         const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(clazz, fieldName, "[C");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jcharArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jcharArray>(const char *className,
                                                         const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(className, fieldName, "[C");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jshortArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jshortArray>(jclass clazz,
                                                          const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(clazz, fieldName, "[S");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jshortArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jshortArray>(const char *className,
                                                          const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(className, fieldName, "[S");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jintArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jintArray>(jclass clazz,
                                                        const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(clazz, fieldName, "[I");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jintArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jintArray>(const char *className,
                                                        const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(className, fieldName, "[I");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jlongArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jlongArray>(jclass clazz,
                                                         const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(clazz, fieldName, "[J");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jlongArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jlongArray>(const char *className,
                                                         const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(className, fieldName, "[J");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jfloatArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jfloatArray>(jclass clazz,
                                                          const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(clazz, fieldName, "[F");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jfloatArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jfloatArray>(const char *className,
                                                          const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(className, fieldName, "[F");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jdoubleArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jdoubleArray>(jclass clazz,
                                                           const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(clazz, fieldName, "[D");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jdoubleArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jdoubleArray>(const char *className,
                                                           const char *fieldName)
 {
     return QJNIObjectPrivate::getStaticObjectField(className, fieldName, "[D");
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jobjectArray>(jclass clazz,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jobjectArray>(jclass clazz,
                                                           const char *fieldName,
                                                           const char *sig)
 {
@@ -1764,7 +1764,7 @@ QJNIObject QJNIObject::getStaticObjectField<jobjectArray>(jclass clazz,
 }
 
 template <>
-QJNIObject QJNIObject::getStaticObjectField<jobjectArray>(const char *className,
+QAndroidJniObject QAndroidJniObject::getStaticObjectField<jobjectArray>(const char *className,
                                                           const char *fieldName,
                                                           const char *sig)
 {
@@ -1772,13 +1772,13 @@ QJNIObject QJNIObject::getStaticObjectField<jobjectArray>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jboolean>(jclass clazz, const char *fieldName, jboolean value)
+void QAndroidJniObject::setStaticField<jboolean>(jclass clazz, const char *fieldName, jboolean value)
 {
     QJNIObjectPrivate::setStaticField<jboolean>(clazz, fieldName, value);
 }
 
 template <>
-void QJNIObject::setStaticField<jboolean>(const char *className,
+void QAndroidJniObject::setStaticField<jboolean>(const char *className,
                                           const char *fieldName,
                                           jboolean value)
 {
@@ -1786,13 +1786,13 @@ void QJNIObject::setStaticField<jboolean>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jbyte>(jclass clazz, const char *fieldName, jbyte value)
+void QAndroidJniObject::setStaticField<jbyte>(jclass clazz, const char *fieldName, jbyte value)
 {
     QJNIObjectPrivate::setStaticField<jbyte>(clazz, fieldName, value);
 }
 
 template <>
-void QJNIObject::setStaticField<jbyte>(const char *className,
+void QAndroidJniObject::setStaticField<jbyte>(const char *className,
                                        const char *fieldName,
                                        jbyte value)
 {
@@ -1800,13 +1800,13 @@ void QJNIObject::setStaticField<jbyte>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jchar>(jclass clazz, const char *fieldName, jchar value)
+void QAndroidJniObject::setStaticField<jchar>(jclass clazz, const char *fieldName, jchar value)
 {
     QJNIObjectPrivate::setStaticField<jchar>(clazz, fieldName, value);
 }
 
 template <>
-void QJNIObject::setStaticField<jchar>(const char *className,
+void QAndroidJniObject::setStaticField<jchar>(const char *className,
                                        const char *fieldName,
                                        jchar value)
 {
@@ -1814,13 +1814,13 @@ void QJNIObject::setStaticField<jchar>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jshort>(jclass clazz, const char *fieldName, jshort value)
+void QAndroidJniObject::setStaticField<jshort>(jclass clazz, const char *fieldName, jshort value)
 {
     QJNIObjectPrivate::setStaticField<jshort>(clazz, fieldName, value);
 }
 
 template <>
-void QJNIObject::setStaticField<jshort>(const char *className,
+void QAndroidJniObject::setStaticField<jshort>(const char *className,
                                         const char *fieldName,
                                         jshort value)
 {
@@ -1828,25 +1828,25 @@ void QJNIObject::setStaticField<jshort>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jint>(jclass clazz, const char *fieldName, jint value)
+void QAndroidJniObject::setStaticField<jint>(jclass clazz, const char *fieldName, jint value)
 {
     QJNIObjectPrivate::setStaticField<jint>(clazz, fieldName, value);
 }
 
 template <>
-void QJNIObject::setStaticField<jint>(const char *className, const char *fieldName, jint value)
+void QAndroidJniObject::setStaticField<jint>(const char *className, const char *fieldName, jint value)
 {
     QJNIObjectPrivate::setStaticField<jint>(className, fieldName, value);
 }
 
 template <>
-void QJNIObject::setStaticField<jlong>(jclass clazz, const char *fieldName, jlong value)
+void QAndroidJniObject::setStaticField<jlong>(jclass clazz, const char *fieldName, jlong value)
 {
     QJNIObjectPrivate::setStaticField<jlong>(clazz, fieldName, value);
 }
 
 template <>
-void QJNIObject::setStaticField<jlong>(const char *className,
+void QAndroidJniObject::setStaticField<jlong>(const char *className,
                                        const char *fieldName,
                                        jlong value)
 {
@@ -1854,13 +1854,13 @@ void QJNIObject::setStaticField<jlong>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jfloat>(jclass clazz, const char *fieldName, jfloat value)
+void QAndroidJniObject::setStaticField<jfloat>(jclass clazz, const char *fieldName, jfloat value)
 {
     QJNIObjectPrivate::setStaticField<jfloat>(clazz, fieldName, value);
 }
 
 template <>
-void QJNIObject::setStaticField<jfloat>(const char *className,
+void QAndroidJniObject::setStaticField<jfloat>(const char *className,
                                         const char *fieldName,
                                         jfloat value)
 {
@@ -1868,13 +1868,13 @@ void QJNIObject::setStaticField<jfloat>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jdouble>(jclass clazz, const char *fieldName, jdouble value)
+void QAndroidJniObject::setStaticField<jdouble>(jclass clazz, const char *fieldName, jdouble value)
 {
     QJNIObjectPrivate::setStaticField<jdouble>(clazz, fieldName, value);
 }
 
 template <>
-void QJNIObject::setStaticField<jdouble>(const char *className,
+void QAndroidJniObject::setStaticField<jdouble>(const char *className,
                                          const char *fieldName,
                                          jdouble value)
 {
@@ -1882,7 +1882,7 @@ void QJNIObject::setStaticField<jdouble>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jobject>(jclass clazz,
+void QAndroidJniObject::setStaticField<jobject>(jclass clazz,
                                          const char *fieldName,
                                          const char *sig,
                                          jobject value)
@@ -1891,7 +1891,7 @@ void QJNIObject::setStaticField<jobject>(jclass clazz,
 }
 
 template <>
-void QJNIObject::setStaticField<jobject>(const char *className,
+void QAndroidJniObject::setStaticField<jobject>(const char *className,
                                          const char *fieldName,
                                          const char *sig,
                                          jobject value)
@@ -1900,7 +1900,7 @@ void QJNIObject::setStaticField<jobject>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jstring>(const char *className,
+void QAndroidJniObject::setStaticField<jstring>(const char *className,
                                          const char *fieldName,
                                          jstring value)
 {
@@ -1908,13 +1908,13 @@ void QJNIObject::setStaticField<jstring>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jstring>(jclass clazz, const char *fieldName, jstring value)
+void QAndroidJniObject::setStaticField<jstring>(jclass clazz, const char *fieldName, jstring value)
 {
     QJNIObjectPrivate::setStaticField<jobject>(clazz, fieldName, "Ljava/lang/String;", value);
 }
 
 template <>
-void QJNIObject::setStaticField<jbooleanArray>(const char *className,
+void QAndroidJniObject::setStaticField<jbooleanArray>(const char *className,
                                                const char *fieldName,
                                                jbooleanArray value)
 {
@@ -1922,7 +1922,7 @@ void QJNIObject::setStaticField<jbooleanArray>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jbooleanArray>(jclass clazz,
+void QAndroidJniObject::setStaticField<jbooleanArray>(jclass clazz,
                                                const char *fieldName,
                                                jbooleanArray value)
 {
@@ -1930,7 +1930,7 @@ void QJNIObject::setStaticField<jbooleanArray>(jclass clazz,
 }
 
 template <>
-void QJNIObject::setStaticField<jbyteArray>(const char *className,
+void QAndroidJniObject::setStaticField<jbyteArray>(const char *className,
                                             const char *fieldName,
                                             jbyteArray value)
 {
@@ -1938,7 +1938,7 @@ void QJNIObject::setStaticField<jbyteArray>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jbyteArray>(jclass clazz,
+void QAndroidJniObject::setStaticField<jbyteArray>(jclass clazz,
                                             const char *fieldName,
                                             jbyteArray value)
 {
@@ -1946,7 +1946,7 @@ void QJNIObject::setStaticField<jbyteArray>(jclass clazz,
 }
 
 template <>
-void QJNIObject::setStaticField<jcharArray>(const char *className,
+void QAndroidJniObject::setStaticField<jcharArray>(const char *className,
                                             const char *fieldName,
                                             jcharArray value)
 {
@@ -1954,7 +1954,7 @@ void QJNIObject::setStaticField<jcharArray>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jcharArray>(jclass clazz,
+void QAndroidJniObject::setStaticField<jcharArray>(jclass clazz,
                                             const char *fieldName,
                                             jcharArray value)
 {
@@ -1962,7 +1962,7 @@ void QJNIObject::setStaticField<jcharArray>(jclass clazz,
 }
 
 template <>
-void QJNIObject::setStaticField<jshortArray>(const char *className,
+void QAndroidJniObject::setStaticField<jshortArray>(const char *className,
                                              const char *fieldName,
                                              jshortArray value)
 {
@@ -1970,7 +1970,7 @@ void QJNIObject::setStaticField<jshortArray>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jshortArray>(jclass clazz,
+void QAndroidJniObject::setStaticField<jshortArray>(jclass clazz,
                                              const char *fieldName,
                                              jshortArray value)
 {
@@ -1978,7 +1978,7 @@ void QJNIObject::setStaticField<jshortArray>(jclass clazz,
 }
 
 template <>
-void QJNIObject::setStaticField<jintArray>(const char *className,
+void QAndroidJniObject::setStaticField<jintArray>(const char *className,
                                            const char *fieldName,
                                            jintArray value)
 {
@@ -1986,7 +1986,7 @@ void QJNIObject::setStaticField<jintArray>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jintArray>(jclass clazz,
+void QAndroidJniObject::setStaticField<jintArray>(jclass clazz,
                                            const char *fieldName,
                                            jintArray value)
 {
@@ -1994,7 +1994,7 @@ void QJNIObject::setStaticField<jintArray>(jclass clazz,
 }
 
 template <>
-void QJNIObject::setStaticField<jlongArray>(const char *className,
+void QAndroidJniObject::setStaticField<jlongArray>(const char *className,
                                             const char *fieldName,
                                             jlongArray value)
 {
@@ -2002,7 +2002,7 @@ void QJNIObject::setStaticField<jlongArray>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jlongArray>(jclass clazz,
+void QAndroidJniObject::setStaticField<jlongArray>(jclass clazz,
                                             const char *fieldName,
                                             jlongArray value)
 {
@@ -2010,7 +2010,7 @@ void QJNIObject::setStaticField<jlongArray>(jclass clazz,
 }
 
 template <>
-void QJNIObject::setStaticField<jfloatArray>(const char *className,
+void QAndroidJniObject::setStaticField<jfloatArray>(const char *className,
                                              const char *fieldName,
                                              jfloatArray value)
 {
@@ -2018,7 +2018,7 @@ void QJNIObject::setStaticField<jfloatArray>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jfloatArray>(jclass clazz,
+void QAndroidJniObject::setStaticField<jfloatArray>(jclass clazz,
                                              const char *fieldName,
                                              jfloatArray value)
 {
@@ -2026,7 +2026,7 @@ void QJNIObject::setStaticField<jfloatArray>(jclass clazz,
 }
 
 template <>
-void QJNIObject::setStaticField<jdoubleArray>(const char *className,
+void QAndroidJniObject::setStaticField<jdoubleArray>(const char *className,
                                               const char *fieldName,
                                               jdoubleArray value)
 {
@@ -2034,49 +2034,49 @@ void QJNIObject::setStaticField<jdoubleArray>(const char *className,
 }
 
 template <>
-void QJNIObject::setStaticField<jdoubleArray>(jclass clazz,
+void QAndroidJniObject::setStaticField<jdoubleArray>(jclass clazz,
                                               const char *fieldName,
                                               jdoubleArray value)
 {
     QJNIObjectPrivate::setStaticField<jobject>(clazz, fieldName, "[D", value);
 }
 
-QJNIObject QJNIObject::fromString(const QString &string)
+QAndroidJniObject QAndroidJniObject::fromString(const QString &string)
 {
     return QJNIObjectPrivate::fromString(string);
 }
 
-QString QJNIObject::toString() const
+QString QAndroidJniObject::toString() const
 {
     return d->toString();
 }
 
-bool QJNIObject::isClassAvailable(const char *className)
+bool QAndroidJniObject::isClassAvailable(const char *className)
 {
     return QJNIObjectPrivate::isClassAvailable(className);
 }
 
-bool QJNIObject::isValid() const
+bool QAndroidJniObject::isValid() const
 {
     return d->isValid();
 }
 
-jobject QJNIObject::javaObject() const
+jobject QAndroidJniObject::javaObject() const
 {
     return d->object();
 }
 
-bool QJNIObject::isSameObject(jobject obj) const
+bool QAndroidJniObject::isSameObject(jobject obj) const
 {
     return d->isSameObject(obj);
 }
 
-bool QJNIObject::isSameObject(const QJNIObject &obj) const
+bool QAndroidJniObject::isSameObject(const QAndroidJniObject &obj) const
 {
     return d->isSameObject(*obj.d);
 }
 
-void QJNIObject::assign(jobject o)
+void QAndroidJniObject::assign(jobject o)
 {
     if (d->isSameObject(o))
         return;
diff --git a/src/androidextras/jni/qjniobject.h b/src/androidextras/jni/qandroidjniobject.h
index 86ddea3..712082f 100644
--- a/src/androidextras/jni/qjniobject.h
+++ b/src/androidextras/jni/qandroidjniobject.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QJNIOBJECT_H
-#define QJNIOBJECT_H
+#ifndef QANDROIDJNIOBJECT_H
+#define QANDROIDJNIOBJECT_H
 
 #include <jni.h>
 #include <QtAndroidExtras/qandroidextrasglobal.h>
@@ -51,16 +51,16 @@ QT_BEGIN_NAMESPACE
 
 class QJNIObjectPrivate;
 
-class Q_ANDROIDEXTRAS_EXPORT QJNIObject
+class Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject
 {
 public:
-    QJNIObject();
-    explicit QJNIObject(const char *className);
-    QJNIObject(const char *className, const char *sig, ...);
-    explicit QJNIObject(jclass clazz);
-    QJNIObject(jclass clazz, const char *sig, ...);
-    QJNIObject(jobject obj);
-    ~QJNIObject() { }
+    QAndroidJniObject();
+    explicit QAndroidJniObject(const char *className);
+    QAndroidJniObject(const char *className, const char *sig, ...);
+    explicit QAndroidJniObject(jclass clazz);
+    QAndroidJniObject(jclass clazz, const char *sig, ...);
+    QAndroidJniObject(jobject obj);
+    ~QAndroidJniObject() { }
 
     template <typename T>
     inline T object() const { return static_cast<T>(javaObject()); }
@@ -70,8 +70,8 @@ public:
     template <typename T>
     T callMethod(const char *methodName, const char *sig, ...) const;
     template <typename T>
-    QJNIObject callObjectMethod(const char *methodName) const;
-    QJNIObject callObjectMethod(const char *methodName,
+    QAndroidJniObject callObjectMethod(const char *methodName) const;
+    QAndroidJniObject callObjectMethod(const char *methodName,
                                 const char *sig,
                                 ...) const;
 
@@ -80,8 +80,8 @@ public:
     template <typename T>
     static T callStaticMethod(const char *className, const char *methodName, const char *sig, ...);
     template <typename T>
-    static QJNIObject callStaticObjectMethod(const char *className, const char *methodName);
-    static QJNIObject callStaticObjectMethod(const char *className,
+    static QAndroidJniObject callStaticObjectMethod(const char *className, const char *methodName);
+    static QAndroidJniObject callStaticObjectMethod(const char *className,
                                              const char *methodName,
                                              const char *sig, ...);
     template <typename T>
@@ -89,32 +89,32 @@ public:
     template <typename T>
     static T callStaticMethod(jclass clazz, const char *methodName, const char *sig, ...);
     template <typename T>
-    static QJNIObject callStaticObjectMethod(jclass clazz, const char *methodName);
-    static QJNIObject callStaticObjectMethod(jclass clazz,
+    static QAndroidJniObject callStaticObjectMethod(jclass clazz, const char *methodName);
+    static QAndroidJniObject callStaticObjectMethod(jclass clazz,
                                              const char *methodName,
                                              const char *sig, ...);
     template <typename T>
     T getField(const char *fieldName) const;
     template <typename T>
-    QJNIObject getObjectField(const char *fieldName) const;
+    QAndroidJniObject getObjectField(const char *fieldName) const;
     template <typename T>
-    QJNIObject getObjectField(const char *fieldName, const char *sig) const;
+    QAndroidJniObject getObjectField(const char *fieldName, const char *sig) const;
     template <typename T>
     void setField(const char *fieldName, T value);
     template <typename T>
     void setField(const char *fieldName, const char *sig, T value);
     template <typename T>
-    static QJNIObject getStaticObjectField(const char *className, const char *fieldName);
+    static QAndroidJniObject getStaticObjectField(const char *className, const char *fieldName);
     template <typename T>
-    static QJNIObject getStaticObjectField(const char *className,
+    static QAndroidJniObject getStaticObjectField(const char *className,
                                            const char *fieldName,
                                            const char *sig);
     template <typename T>
     static T getStaticField(const char *className, const char *fieldName);
     template <typename T>
-    static QJNIObject getStaticObjectField(jclass clazz, const char *fieldName);
+    static QAndroidJniObject getStaticObjectField(jclass clazz, const char *fieldName);
     template <typename T>
-    static QJNIObject getStaticObjectField(jclass clazz,
+    static QAndroidJniObject getStaticObjectField(jclass clazz,
                                            const char *fieldName,
                                            const char *sig);
     template <typename T>
@@ -132,71 +132,71 @@ public:
     template <typename T>
     static void setStaticField(jclass clazz, const char *fieldName, T value);
 
-    static QJNIObject fromString(const QString &string);
+    static QAndroidJniObject fromString(const QString &string);
     QString toString() const;
 
     static bool isClassAvailable(const char *className);
     bool isValid() const;
 
     template <typename T>
-    inline QJNIObject &operator=(T o)
+    inline QAndroidJniObject &operator=(T o)
     {
         assign(static_cast<jobject>(o));
         return *this;
     }
 
 private:
-    friend bool operator==(const QJNIObject &, const QJNIObject &);
-    friend bool operator!=(const QJNIObject &, const QJNIObject &);
-    template <typename T> friend bool operator!=(const QJNIObject &, T);
-    template <typename T> friend bool operator==(const QJNIObject &, T);
-    template <typename T> friend bool operator!=(T, const QJNIObject &);
-    template <typename T> friend bool operator==(T, const QJNIObject &);
+    friend bool operator==(const QAndroidJniObject &, const QAndroidJniObject &);
+    friend bool operator!=(const QAndroidJniObject &, const QAndroidJniObject &);
+    template <typename T> friend bool operator!=(const QAndroidJniObject &, T);
+    template <typename T> friend bool operator==(const QAndroidJniObject &, T);
+    template <typename T> friend bool operator!=(T, const QAndroidJniObject &);
+    template <typename T> friend bool operator==(T, const QAndroidJniObject &);
 
-    QJNIObject(const QJNIObjectPrivate &o);
+    QAndroidJniObject(const QJNIObjectPrivate &o);
 
     void assign(jobject o);
     jobject javaObject() const;
     bool isSameObject(jobject obj) const;
-    bool isSameObject(const QJNIObject &obj) const;
+    bool isSameObject(const QAndroidJniObject &obj) const;
 
     QSharedPointer<QJNIObjectPrivate> d;
 };
 
-inline bool operator==(const QJNIObject &obj1, const QJNIObject &obj2)
+inline bool operator==(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2)
 {
     return obj1.isSameObject(obj2);
 }
 
-inline bool operator!=(const QJNIObject &obj1, const QJNIObject &obj2)
+inline bool operator!=(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2)
 {
     return !obj1.isSameObject(obj2);
 }
 
 template <typename T>
-inline bool operator==(const QJNIObject &obj1, T obj2)
+inline bool operator==(const QAndroidJniObject &obj1, T obj2)
 {
     return obj1.isSameObject(static_cast<jobject>(obj2));
 }
 
 template <typename T>
-inline bool operator==(T obj1, const QJNIObject &obj2)
+inline bool operator==(T obj1, const QAndroidJniObject &obj2)
 {
     return obj2.isSameObject(static_cast<jobject>(obj1));
 }
 
 template <typename T>
-inline bool operator!=(const QJNIObject &obj1, T obj2)
+inline bool operator!=(const QAndroidJniObject &obj1, T obj2)
 {
     return !obj1.isSameObject(static_cast<jobject>(obj2));
 }
 
 template <typename T>
-inline bool operator!=(T obj1, const QJNIObject &obj2)
+inline bool operator!=(T obj1, const QAndroidJniObject &obj2)
 {
     return !obj2.isSameObject(static_cast<jobject>(obj1));
 }
 
 QT_END_NAMESPACE
 
-#endif // QJNIOBJECT_H
+#endif // QANDROIDJNIOBJECT_H
diff --git a/src/src.pro b/src/src.pro
index 467ccc4..a15e9b8 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,2 +1,7 @@
-TEMPLATE = subdirs
-android:SUBDIRS += androidextras
+android {
+    TEMPLATE = subdirs
+    SUBDIRS += androidextras
+} else {
+    TEMPLATE = aux
+    QMAKE_DOCS = $$PWD/androidextras/doc/qtandroidextras.qdocconf
+}
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index a758912..94b6dd8 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-        qjnienvironment \
-        qjniobject
+        cmake \
+        qandroidjnienvironment \
+        qandroidjniobject
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
new file mode 100644
index 0000000..a786745
--- /dev/null
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+cmake_minimum_required(VERSION 2.8)
+
+project(qmake_cmake_files)
+
+enable_testing()
+
+find_package(Qt5Core REQUIRED)
+
+include("${_Qt5CTestMacros}")
+
+test_module_includes(
+  AndroidExtras QAndroidJniObject
+)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
new file mode 100644
index 0000000..be97e6a
--- /dev/null
+++ b/tests/auto/cmake/cmake.pro
@@ -0,0 +1,7 @@
+
+# Cause make to do nothing.
+TEMPLATE = subdirs
+
+CMAKE_QT_MODULES_UNDER_TEST = androidextras
+
+CONFIG += ctest_testcase
diff --git a/tests/auto/qandroidjnienvironment/qandroidjnienvironment.pro b/tests/auto/qandroidjnienvironment/qandroidjnienvironment.pro
new file mode 100644
index 0000000..3c4fcf7
--- /dev/null
+++ b/tests/auto/qandroidjnienvironment/qandroidjnienvironment.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qandroidjnienvironment
+QT += testlib androidextras
+SOURCES += tst_qandroidjnienvironment.cpp
diff --git a/tests/auto/qjnienvironment/tst_qjnienvironment.cpp b/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp
index 7d5de58..307e6b7 100644
--- a/tests/auto/qjnienvironment/tst_qjnienvironment.cpp
+++ b/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtAndroidExtras/QJNIEnvironment>
+#include <QtAndroidExtras/QAndroidJniEnvironment>
 
-class tst_QJNIEnvironment : public QObject
+class tst_QAndroidJniEnvironment : public QObject
 {
     Q_OBJECT
 
@@ -54,14 +54,14 @@ public:
     static JavaVM *m_javaVM;
 };
 
-JavaVM *tst_QJNIEnvironment::m_javaVM = 0;
+JavaVM *tst_QAndroidJniEnvironment::m_javaVM = 0;
 
-void tst_QJNIEnvironment::jniEnv()
+void tst_QAndroidJniEnvironment::jniEnv()
 {
     QVERIFY(m_javaVM);
 
     {
-        QJNIEnvironment env;
+        QAndroidJniEnvironment env;
 
         // JNI environment should now be attached to the current thread
         JNIEnv *jni = 0;
@@ -82,16 +82,16 @@ void tst_QJNIEnvironment::jniEnv()
         env->ExceptionClear();
     }
 
-    // The environment should automatically be detached when QJNIEnvironment goes out of scope
+    // The environment should automatically be detached when QAndroidJniEnvironment goes out of scope
     JNIEnv *jni = 0;
     QCOMPARE(m_javaVM->GetEnv((void**)&jni, JNI_VERSION_1_6), JNI_EDETACHED);
 }
 
-void tst_QJNIEnvironment::javaVM()
+void tst_QAndroidJniEnvironment::javaVM()
 {
     QVERIFY(m_javaVM);
 
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     QCOMPARE(env.javaVM(), m_javaVM);
 
     JavaVM *vm = 0;
@@ -102,10 +102,10 @@ void tst_QJNIEnvironment::javaVM()
 Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 {
     Q_UNUSED(reserved)
-    tst_QJNIEnvironment::m_javaVM = vm;
+    tst_QAndroidJniEnvironment::m_javaVM = vm;
     return JNI_VERSION_1_6;
 }
 
-QTEST_APPLESS_MAIN(tst_QJNIEnvironment)
+QTEST_APPLESS_MAIN(tst_QAndroidJniEnvironment)
 
-#include "tst_qjnienvironment.moc"
+#include "tst_qandroidjnienvironment.moc"
diff --git a/tests/auto/qandroidjniobject/qandroidjniobject.pro b/tests/auto/qandroidjniobject/qandroidjniobject.pro
new file mode 100644
index 0000000..83e658a
--- /dev/null
+++ b/tests/auto/qandroidjniobject/qandroidjniobject.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qandroidjniobject
+QT += testlib androidextras
+SOURCES += tst_qandroidjniobject.cpp
diff --git a/tests/auto/qjniobject/tst_qjniobject.cpp b/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp
index cc0f286..4b8f1d5 100644
--- a/tests/auto/qjniobject/tst_qjniobject.cpp
+++ b/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp
@@ -41,15 +41,15 @@
 
 #include <QString>
 #include <QtTest>
-#include <QtAndroidExtras/QJNIObject>
-#include <QtAndroidExtras/QJNIEnvironment>
+#include <QtAndroidExtras/QAndroidJniObject>
+#include <QtAndroidExtras/QAndroidJniEnvironment>
 
-class tst_QJNIObject : public QObject
+class tst_QAndroidJniObject : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QJNIObject();
+    tst_QAndroidJniObject();
 
 private slots:
     void initTestCase();
@@ -102,62 +102,62 @@ public:
     static jclass m_activityDelegateClass;
 };
 
-jclass tst_QJNIObject::m_activityDelegateClass = 0;
+jclass tst_QAndroidJniObject::m_activityDelegateClass = 0;
 
-tst_QJNIObject::tst_QJNIObject()
+tst_QAndroidJniObject::tst_QAndroidJniObject()
 {
 }
 
-void tst_QJNIObject::initTestCase()
+void tst_QAndroidJniObject::initTestCase()
 {
 }
 
-void tst_QJNIObject::cleanupTestCase()
+void tst_QAndroidJniObject::cleanupTestCase()
 {
 }
 
-void tst_QJNIObject::ctor()
+void tst_QAndroidJniObject::ctor()
 {
     {
-        QJNIObject object;
+        QAndroidJniObject object;
         QVERIFY(!object.isValid());
     }
 
     {
-        QJNIObject object("java/lang/String");
+        QAndroidJniObject object("java/lang/String");
         QVERIFY(object.isValid());
     }
 
     {
-        QJNIObject string = QJNIObject::fromString(QLatin1String("Hello, Java"));
-        QJNIObject object("java/lang/String", "(Ljava/lang/String;)V", string.object<jstring>());
+        QAndroidJniObject string = QAndroidJniObject::fromString(QLatin1String("Hello, Java"));
+        QAndroidJniObject object("java/lang/String", "(Ljava/lang/String;)V", string.object<jstring>());
         QVERIFY(object.isValid());
         QCOMPARE(string.toString(), object.toString());
     }
 
     {
-        QJNIEnvironment env;
+        QAndroidJniEnvironment env;
         jclass javaStringClass = env->FindClass("java/lang/String");
-        QJNIObject string(javaStringClass);
+        QAndroidJniObject string(javaStringClass);
         QVERIFY(string.isValid());
     }
 
     {
-        QJNIEnvironment env;
+        QAndroidJniEnvironment env;
         const QString qString = QLatin1String("Hello, Java");
         jclass javaStringClass = env->FindClass("java/lang/String");
-        QJNIObject string = QJNIObject::fromString(qString);
-        QJNIObject stringCpy(javaStringClass, "(Ljava/lang/String;)V", string.object<jstring>());
+        QAndroidJniObject string = QAndroidJniObject::fromString(qString);
+        QAndroidJniObject stringCpy(javaStringClass, "(Ljava/lang/String;)V", string.object<jstring>());
         QVERIFY(stringCpy.isValid());
         QCOMPARE(qString, stringCpy.toString());
     }
 }
 
-void tst_QJNIObject::callMethodTest()
+void tst_QAndroidJniObject::callMethodTest()
 {
     {
-        QJNIObject jString1 = QJNIObject::fromString(QLatin1String("Hello, Java"));
-        QJNIObject jString2 = QJNIObject::fromString(QLatin1String("hELLO, jAVA"));
+        QAndroidJniObject jString1 = QAndroidJniObject::fromString(QLatin1String("Hello, Java"));
+        QAndroidJniObject jString2 = QAndroidJniObject::fromString(QLatin1String("hELLO, jAVA"));
         QVERIFY(jString1 != jString2);
 
         const jboolean isEmpty = jString1.callMethod<jboolean>("isEmpty");
@@ -171,38 +171,38 @@ void tst_QJNIObject::callMethodTest()
 
     {
         jlong jLong = 100;
-        QJNIObject longObject("java/lang/Long", "(J)V", jLong);
+        QAndroidJniObject longObject("java/lang/Long", "(J)V", jLong);
         jlong ret = longObject.callMethod<jlong>("longValue");
         QCOMPARE(ret, jLong);
     }
 }
 
-void tst_QJNIObject::callObjectMethodTest()
+void tst_QAndroidJniObject::callObjectMethodTest()
 {
     const QString qString = QLatin1String("Hello, Java");
-    QJNIObject jString = QJNIObject::fromString(qString);
+    QAndroidJniObject jString = QAndroidJniObject::fromString(qString);
     const QString qStringRet = jString.callObjectMethod<jstring>("toUpperCase").toString();
     QCOMPARE(qString.toUpper(), qStringRet);
 
-    QJNIObject subString = jString.callObjectMethod("substring",
+    QAndroidJniObject subString = jString.callObjectMethod("substring",
                                                     "(II)Ljava/lang/String;",
                                                     0, 4);
     QCOMPARE(subString.toString(), qString.mid(0, 4));
 }
 
-void tst_QJNIObject::stringConvertionTest()
+void tst_QAndroidJniObject::stringConvertionTest()
 {
     const QString qString(QLatin1String("Hello, Java"));
-    QJNIObject jString = QJNIObject::fromString(qString);
+    QAndroidJniObject jString = QAndroidJniObject::fromString(qString);
     QVERIFY(jString.isValid());
     QString qStringRet = jString.toString();
     QCOMPARE(qString, qStringRet);
 }
 
-void tst_QJNIObject::compareOperatorTests()
+void tst_QAndroidJniObject::compareOperatorTests()
 {
     QString str("hello!");
-    QJNIObject stringObject = QJNIObject::fromString(str);
+    QAndroidJniObject stringObject = QAndroidJniObject::fromString(str);
 
     jobject jobj = stringObject.object<jobject>();
     jstring jsobj = stringObject.object<jstring>();
@@ -212,14 +212,14 @@ void tst_QJNIObject::compareOperatorTests()
     QVERIFY(jsobj == stringObject);
     QVERIFY(stringObject == jsobj);
 
-    QJNIObject stringObject3 = stringObject.object<jstring>();
+    QAndroidJniObject stringObject3 = stringObject.object<jstring>();
     QVERIFY(stringObject3 == stringObject);
 
-    QJNIObject stringObject2 = QJNIObject::fromString(str);
+    QAndroidJniObject stringObject2 = QAndroidJniObject::fromString(str);
     QVERIFY(stringObject != stringObject2);
 
     jstring jstrobj = 0;
-    QJNIObject invalidStringObject;
+    QAndroidJniObject invalidStringObject;
     QVERIFY(invalidStringObject == jstrobj);
 
     QVERIFY(jstrobj != stringObject);
@@ -227,13 +227,13 @@ void tst_QJNIObject::compareOperatorTests()
     QVERIFY(!invalidStringObject.isValid());
 }
 
-void tst_QJNIObject::callStaticObjectMethodClassName()
+void tst_QAndroidJniObject::callStaticObjectMethodClassName()
 {
-    QJNIObject formatString = QJNIObject::fromString(QLatin1String("test format"));
+    QAndroidJniObject formatString = QAndroidJniObject::fromString(QLatin1String("test format"));
     QVERIFY(formatString.isValid());
 
-    QVERIFY(QJNIObject::isClassAvailable("java/lang/String"));
-    QJNIObject returnValue = QJNIObject::callStaticObjectMethod("java/lang/String",
+    QVERIFY(QAndroidJniObject::isClassAvailable("java/lang/String"));
+    QAndroidJniObject returnValue = QAndroidJniObject::callStaticObjectMethod("java/lang/String",
                                                                 "format",
                                                                 "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;",
                                                                 formatString.object<jstring>(),
@@ -245,16 +245,16 @@ void tst_QJNIObject::callStaticObjectMethodClassName()
     QCOMPARE(returnedString, QString::fromLatin1("test format"));
 }
 
-void tst_QJNIObject::callStaticObjectMethod()
+void tst_QAndroidJniObject::callStaticObjectMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/String");
     QVERIFY(cls != 0);
 
-    QJNIObject formatString = QJNIObject::fromString(QLatin1String("test format"));
+    QAndroidJniObject formatString = QAndroidJniObject::fromString(QLatin1String("test format"));
     QVERIFY(formatString.isValid());
 
-    QJNIObject returnValue = QJNIObject::callStaticObjectMethod(cls,
+    QAndroidJniObject returnValue = QAndroidJniObject::callStaticObjectMethod(cls,
                                                                 "format",
                                                                 "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;",
                                                                 formatString.object<jstring>(),
@@ -266,17 +266,17 @@ void tst_QJNIObject::callStaticObjectMethod()
     QCOMPARE(returnedString, QString::fromLatin1("test format"));
 }
 
-void tst_QJNIObject::callStaticBooleanMethod()
+void tst_QAndroidJniObject::callStaticBooleanMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Boolean");
     QVERIFY(cls != 0);
 
     {
-        QJNIObject parameter = QJNIObject::fromString("true");
+        QAndroidJniObject parameter = QAndroidJniObject::fromString("true");
         QVERIFY(parameter.isValid());
 
-        jboolean b = QJNIObject::callStaticMethod<jboolean>(cls,
+        jboolean b = QAndroidJniObject::callStaticMethod<jboolean>(cls,
                                                             "parseBoolean",
                                                             "(Ljava/lang/String;)Z",
                                                             parameter.object<jstring>());
@@ -284,10 +284,10 @@ void tst_QJNIObject::callStaticBooleanMethod()
     }
 
     {
-        QJNIObject parameter = QJNIObject::fromString("false");
+        QAndroidJniObject parameter = QAndroidJniObject::fromString("false");
         QVERIFY(parameter.isValid());
 
-        jboolean b = QJNIObject::callStaticMethod<jboolean>(cls,
+        jboolean b = QAndroidJniObject::callStaticMethod<jboolean>(cls,
                                                             "parseBoolean",
                                                             "(Ljava/lang/String;)Z",
                                                             parameter.object<jstring>());
@@ -295,13 +295,13 @@ void tst_QJNIObject::callStaticBooleanMethod()
     }
 }
 
-void tst_QJNIObject::callStaticBooleanMethodClassName()
+void tst_QAndroidJniObject::callStaticBooleanMethodClassName()
 {
     {
-        QJNIObject parameter = QJNIObject::fromString("true");
+        QAndroidJniObject parameter = QAndroidJniObject::fromString("true");
         QVERIFY(parameter.isValid());
 
-        jboolean b = QJNIObject::callStaticMethod<jboolean>("java/lang/Boolean",
+        jboolean b = QAndroidJniObject::callStaticMethod<jboolean>("java/lang/Boolean",
                                                             "parseBoolean",
                                                             "(Ljava/lang/String;)Z",
                                                             parameter.object<jstring>());
@@ -309,10 +309,10 @@ void tst_QJNIObject::callStaticBooleanMethodClassName()
     }
 
     {
-        QJNIObject parameter = QJNIObject::fromString("false");
+        QAndroidJniObject parameter = QAndroidJniObject::fromString("false");
         QVERIFY(parameter.isValid());
 
-        jboolean b = QJNIObject::callStaticMethod<jboolean>("java/lang/Boolean",
+        jboolean b = QAndroidJniObject::callStaticMethod<jboolean>("java/lang/Boolean",
                                                             "parseBoolean",
                                                             "(Ljava/lang/String;)Z",
                                                             parameter.object<jstring>());
@@ -320,40 +320,40 @@ void tst_QJNIObject::callStaticBooleanMethodClassName()
     }
 }
 
-void tst_QJNIObject::callStaticByteMethodClassName()
+void tst_QAndroidJniObject::callStaticByteMethodClassName()
 {
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jbyte returnValue = QJNIObject::callStaticMethod<jbyte>("java/lang/Byte",
+    jbyte returnValue = QAndroidJniObject::callStaticMethod<jbyte>("java/lang/Byte",
                                                             "parseByte",
                                                             "(Ljava/lang/String;)B",
                                                             parameter.object<jstring>());
     QCOMPARE(returnValue, jbyte(number.toInt()));
 }
 
-void tst_QJNIObject::callStaticByteMethod()
+void tst_QAndroidJniObject::callStaticByteMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Byte");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jbyte returnValue = QJNIObject::callStaticMethod<jbyte>(cls,
+    jbyte returnValue = QAndroidJniObject::callStaticMethod<jbyte>(cls,
                                                             "parseByte",
                                                             "(Ljava/lang/String;)B",
                                                             parameter.object<jstring>());
     QCOMPARE(returnValue, jbyte(number.toInt()));
 }
 
-void tst_QJNIObject::callStaticIntMethodClassName()
+void tst_QAndroidJniObject::callStaticIntMethodClassName()
 {
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jint returnValue = QJNIObject::callStaticMethod<jint>("java/lang/Integer",
+    jint returnValue = QAndroidJniObject::callStaticMethod<jint>("java/lang/Integer",
                                                           "parseInt",
                                                           "(Ljava/lang/String;)I",
                                                           parameter.object<jstring>());
@@ -361,25 +361,25 @@ void tst_QJNIObject::callStaticIntMethodClassName()
 }
 
 
-void tst_QJNIObject::callStaticIntMethod()
+void tst_QAndroidJniObject::callStaticIntMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Integer");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jint returnValue = QJNIObject::callStaticMethod<jint>(cls,
+    jint returnValue = QAndroidJniObject::callStaticMethod<jint>(cls,
                                                           "parseInt",
                                                           "(Ljava/lang/String;)I",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, number.toInt());
 }
 
-void tst_QJNIObject::callStaticCharMethodClassName()
+void tst_QAndroidJniObject::callStaticCharMethodClassName()
 {
-    jchar returnValue = QJNIObject::callStaticMethod<jchar>("java/lang/Character",
+    jchar returnValue = QAndroidJniObject::callStaticMethod<jchar>("java/lang/Character",
                                                             "toUpperCase",
                                                             "(C)C",
                                                             jchar('a'));
@@ -387,25 +387,25 @@ void tst_QJNIObject::callStaticCharMethodClassName()
 }
 
 
-void tst_QJNIObject::callStaticCharMethod()
+void tst_QAndroidJniObject::callStaticCharMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Character");
     QVERIFY(cls != 0);
 
-    jchar returnValue = QJNIObject::callStaticMethod<jchar>(cls,
+    jchar returnValue = QAndroidJniObject::callStaticMethod<jchar>(cls,
                                                             "toUpperCase",
                                                             "(C)C",
                                                             jchar('a'));
     QCOMPARE(returnValue, jchar('A'));
 }
 
-void tst_QJNIObject::callStaticDoubleMethodClassName    ()
+void tst_QAndroidJniObject::callStaticDoubleMethodClassName    ()
 {
     QString number = QString::number(123.45);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jdouble returnValue = QJNIObject::callStaticMethod<jdouble>("java/lang/Double",
+    jdouble returnValue = QAndroidJniObject::callStaticMethod<jdouble>("java/lang/Double",
                                                           "parseDouble",
                                                           "(Ljava/lang/String;)D",
                                                           parameter.object<jstring>());
@@ -413,28 +413,28 @@ void tst_QJNIObject::callStaticDoubleMethodClassName    ()
 }
 
 
-void tst_QJNIObject::callStaticDoubleMethod()
+void tst_QAndroidJniObject::callStaticDoubleMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Double");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123.45);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jdouble returnValue = QJNIObject::callStaticMethod<jdouble>(cls,
+    jdouble returnValue = QAndroidJniObject::callStaticMethod<jdouble>(cls,
                                                           "parseDouble",
                                                           "(Ljava/lang/String;)D",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, number.toDouble());
 }
 
-void tst_QJNIObject::callStaticFloatMethodClassName()
+void tst_QAndroidJniObject::callStaticFloatMethodClassName()
 {
     QString number = QString::number(123.45);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jfloat returnValue = QJNIObject::callStaticMethod<jfloat>("java/lang/Float",
+    jfloat returnValue = QAndroidJniObject::callStaticMethod<jfloat>("java/lang/Float",
                                                           "parseFloat",
                                                           "(Ljava/lang/String;)F",
                                                           parameter.object<jstring>());
@@ -442,28 +442,28 @@ void tst_QJNIObject::callStaticFloatMethodClassName()
 }
 
 
-void tst_QJNIObject::callStaticFloatMethod()
+void tst_QAndroidJniObject::callStaticFloatMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Float");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123.45);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jfloat returnValue = QJNIObject::callStaticMethod<jfloat>(cls,
+    jfloat returnValue = QAndroidJniObject::callStaticMethod<jfloat>(cls,
                                                           "parseFloat",
                                                           "(Ljava/lang/String;)F",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, number.toFloat());
 }
 
-void tst_QJNIObject::callStaticShortMethodClassName()
+void tst_QAndroidJniObject::callStaticShortMethodClassName()
 {
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jshort returnValue = QJNIObject::callStaticMethod<jshort>("java/lang/Short",
+    jshort returnValue = QAndroidJniObject::callStaticMethod<jshort>("java/lang/Short",
                                                           "parseShort",
                                                           "(Ljava/lang/String;)S",
                                                           parameter.object<jstring>());
@@ -471,54 +471,54 @@ void tst_QJNIObject::callStaticShortMethodClassName()
 }
 
 
-void tst_QJNIObject::callStaticShortMethod()
+void tst_QAndroidJniObject::callStaticShortMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Short");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jshort returnValue = QJNIObject::callStaticMethod<jshort>(cls,
+    jshort returnValue = QAndroidJniObject::callStaticMethod<jshort>(cls,
                                                           "parseShort",
                                                           "(Ljava/lang/String;)S",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, number.toShort());
 }
 
-void tst_QJNIObject::callStaticLongMethodClassName()
+void tst_QAndroidJniObject::callStaticLongMethodClassName()
 {
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jlong returnValue = QJNIObject::callStaticMethod<jlong>("java/lang/Long",
+    jlong returnValue = QAndroidJniObject::callStaticMethod<jlong>("java/lang/Long",
                                                           "parseLong",
                                                           "(Ljava/lang/String;)J",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, jlong(number.toLong()));
 }
 
-void tst_QJNIObject::callStaticLongMethod()
+void tst_QAndroidJniObject::callStaticLongMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Long");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jlong returnValue = QJNIObject::callStaticMethod<jlong>(cls,
+    jlong returnValue = QAndroidJniObject::callStaticMethod<jlong>(cls,
                                                           "parseLong",
                                                           "(Ljava/lang/String;)J",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, jlong(number.toLong()));
 }
 
-void tst_QJNIObject::getStaticObjectFieldClassName()
+void tst_QAndroidJniObject::getStaticObjectFieldClassName()
 {
     {
-        QJNIObject boolObject = QJNIObject::getStaticObjectField<jobject>("java/lang/Boolean",
+        QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField<jobject>("java/lang/Boolean",
                                                                           "FALSE",
                                                                           "Ljava/lang/Boolean;");
         QVERIFY(boolObject.isValid());
@@ -528,7 +528,7 @@ void tst_QJNIObject::getStaticObjectFieldClassName()
     }
 
     {
-        QJNIObject boolObject = QJNIObject::getStaticObjectField<jobject>("java/lang/Boolean",
+        QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField<jobject>("java/lang/Boolean",
                                                                  "TRUE",
                                                                  "Ljava/lang/Boolean;");
         QVERIFY(boolObject.isValid());
@@ -538,14 +538,14 @@ void tst_QJNIObject::getStaticObjectFieldClassName()
     }
 }
 
-void tst_QJNIObject::getStaticObjectField()
+void tst_QAndroidJniObject::getStaticObjectField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Boolean");
     QVERIFY(cls != 0);
 
     {
-        QJNIObject boolObject = QJNIObject::getStaticObjectField<jobject>(cls,
+        QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField<jobject>(cls,
                                                                           "FALSE",
                                                                           "Ljava/lang/Boolean;");
         QVERIFY(boolObject.isValid());
@@ -555,7 +555,7 @@ void tst_QJNIObject::getStaticObjectField()
     }
 
     {
-        QJNIObject boolObject = QJNIObject::getStaticObjectField<jobject>(cls,
+        QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField<jobject>(cls,
                                                                  "TRUE",
                                                                  "Ljava/lang/Boolean;");
         QVERIFY(boolObject.isValid());
@@ -565,138 +565,138 @@ void tst_QJNIObject::getStaticObjectField()
     }
 }
 
-void tst_QJNIObject::getStaticIntFieldClassName()
+void tst_QAndroidJniObject::getStaticIntFieldClassName()
 {
-    jint i = QJNIObject::getStaticField<jint>("java/lang/Double", "SIZE");
+    jint i = QAndroidJniObject::getStaticField<jint>("java/lang/Double", "SIZE");
     QCOMPARE(i, 64);
 }
 
-void tst_QJNIObject::getStaticIntField()
+void tst_QAndroidJniObject::getStaticIntField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Double");
     QVERIFY(cls != 0);
 
-    jint i = QJNIObject::getStaticField<jint>(cls, "SIZE");
+    jint i = QAndroidJniObject::getStaticField<jint>(cls, "SIZE");
     QCOMPARE(i, 64);
 }
 
-void tst_QJNIObject::getStaticByteFieldClassName()
+void tst_QAndroidJniObject::getStaticByteFieldClassName()
 {
-    jbyte i = QJNIObject::getStaticField<jbyte>("java/lang/Byte", "MAX_VALUE");
+    jbyte i = QAndroidJniObject::getStaticField<jbyte>("java/lang/Byte", "MAX_VALUE");
     QCOMPARE(i, jbyte(127));
 }
 
-void tst_QJNIObject::getStaticByteField()
+void tst_QAndroidJniObject::getStaticByteField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Byte");
     QVERIFY(cls != 0);
 
-    jbyte i = QJNIObject::getStaticField<jbyte>(cls, "MAX_VALUE");
+    jbyte i = QAndroidJniObject::getStaticField<jbyte>(cls, "MAX_VALUE");
     QCOMPARE(i, jbyte(127));
 }
 
-void tst_QJNIObject::getStaticLongFieldClassName()
+void tst_QAndroidJniObject::getStaticLongFieldClassName()
 {
-    jlong i = QJNIObject::getStaticField<jlong>("java/lang/Long", "MAX_VALUE");
+    jlong i = QAndroidJniObject::getStaticField<jlong>("java/lang/Long", "MAX_VALUE");
     QCOMPARE(i, jlong(9223372036854775807L));
 }
 
-void tst_QJNIObject::getStaticLongField()
+void tst_QAndroidJniObject::getStaticLongField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Long");
     QVERIFY(cls != 0);
 
-    jlong i = QJNIObject::getStaticField<jlong>(cls, "MAX_VALUE");
+    jlong i = QAndroidJniObject::getStaticField<jlong>(cls, "MAX_VALUE");
     QCOMPARE(i, jlong(9223372036854775807L));
 }
 
-void tst_QJNIObject::getStaticDoubleFieldClassName()
+void tst_QAndroidJniObject::getStaticDoubleFieldClassName()
 {
-    jdouble i = QJNIObject::getStaticField<jdouble>("java/lang/Double", "NaN");
+    jdouble i = QAndroidJniObject::getStaticField<jdouble>("java/lang/Double", "NaN");
     jlong *k = reinterpret_cast<jlong*>(&i);
     QCOMPARE(*k, jlong(0x7ff8000000000000L));
 }
 
-void tst_QJNIObject::getStaticDoubleField()
+void tst_QAndroidJniObject::getStaticDoubleField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Double");
     QVERIFY(cls != 0);
 
-    jdouble i = QJNIObject::getStaticField<jdouble>(cls, "NaN");
+    jdouble i = QAndroidJniObject::getStaticField<jdouble>(cls, "NaN");
     jlong *k = reinterpret_cast<jlong*>(&i);
     QCOMPARE(*k, jlong(0x7ff8000000000000L));
 }
 
-void tst_QJNIObject::getStaticFloatFieldClassName()
+void tst_QAndroidJniObject::getStaticFloatFieldClassName()
 {
-    jfloat i = QJNIObject::getStaticField<jfloat>("java/lang/Float", "NaN");
+    jfloat i = QAndroidJniObject::getStaticField<jfloat>("java/lang/Float", "NaN");
     unsigned *k = reinterpret_cast<unsigned*>(&i);
     QCOMPARE(*k, unsigned(0x7fc00000));
 }
 
-void tst_QJNIObject::getStaticFloatField()
+void tst_QAndroidJniObject::getStaticFloatField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Float");
     QVERIFY(cls != 0);
 
-    jfloat i = QJNIObject::getStaticField<jfloat>(cls, "NaN");
+    jfloat i = QAndroidJniObject::getStaticField<jfloat>(cls, "NaN");
     unsigned *k = reinterpret_cast<unsigned*>(&i);
     QCOMPARE(*k, unsigned(0x7fc00000));
 }
 
-void tst_QJNIObject::getStaticShortFieldClassName()
+void tst_QAndroidJniObject::getStaticShortFieldClassName()
 {
-    jshort i = QJNIObject::getStaticField<jshort>("java/lang/Short", "MAX_VALUE");
+    jshort i = QAndroidJniObject::getStaticField<jshort>("java/lang/Short", "MAX_VALUE");
     QCOMPARE(i, jshort(32767));
 }
 
-void tst_QJNIObject::getStaticShortField()
+void tst_QAndroidJniObject::getStaticShortField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Short");
     QVERIFY(cls != 0);
 
-    jshort i = QJNIObject::getStaticField<jshort>(cls, "MAX_VALUE");
+    jshort i = QAndroidJniObject::getStaticField<jshort>(cls, "MAX_VALUE");
     QCOMPARE(i, jshort(32767));
 }
 
-void tst_QJNIObject::getStaticCharFieldClassName()
+void tst_QAndroidJniObject::getStaticCharFieldClassName()
 {
-    jchar i = QJNIObject::getStaticField<jchar>("java/lang/Character", "MAX_VALUE");
+    jchar i = QAndroidJniObject::getStaticField<jchar>("java/lang/Character", "MAX_VALUE");
     QCOMPARE(i, jchar(0xffff));
 }
 
-void tst_QJNIObject::getStaticCharField()
+void tst_QAndroidJniObject::getStaticCharField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Character");
     QVERIFY(cls != 0);
 
-    jchar i = QJNIObject::getStaticField<jchar>(cls, "MAX_VALUE");
+    jchar i = QAndroidJniObject::getStaticField<jchar>(cls, "MAX_VALUE");
     QCOMPARE(i, jchar(0xffff));
 }
 
 
-void tst_QJNIObject::getBooleanField()
+void tst_QAndroidJniObject::getBooleanField()
 {
     QVERIFY(m_activityDelegateClass);
 
-    QJNIObject obj(m_activityDelegateClass);
+    QAndroidJniObject obj(m_activityDelegateClass);
 
     QVERIFY(obj.isValid());
     QVERIFY(!obj.getField<jboolean>("m_fullScreen"));
 }
 
-void tst_QJNIObject::getIntField()
+void tst_QAndroidJniObject::getIntField()
 {
     QVERIFY(m_activityDelegateClass);
 
-    QJNIObject obj(m_activityDelegateClass);
+    QAndroidJniObject obj(m_activityDelegateClass);
 
     QVERIFY(obj.isValid());
     jint res = obj.getField<jint>("m_currentRotation");
@@ -720,11 +720,11 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
     JNIEnv *env = uenv.nenv;
 
     jclass clazz = env->FindClass("org/qtproject/qt5/android/QtActivityDelegate");
-    tst_QJNIObject::m_activityDelegateClass = (jclass)env->NewGlobalRef(clazz);
+    tst_QAndroidJniObject::m_activityDelegateClass = (jclass)env->NewGlobalRef(clazz);
 
     return JNI_VERSION_1_6;
 }
 
-QTEST_APPLESS_MAIN(tst_QJNIObject)
+QTEST_APPLESS_MAIN(tst_QAndroidJniObject)
 
-#include "tst_qjniobject.moc"
+#include "tst_qandroidjniobject.moc"
diff --git a/tests/auto/qjnienvironment/qjnienvironment.pro b/tests/auto/qjnienvironment/qjnienvironment.pro
deleted file mode 100644
index e4b7b09..0000000
--- a/tests/auto/qjnienvironment/qjnienvironment.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qjnienvironment
-QT += testlib androidextras
-SOURCES += tst_qjnienvironment.cpp
diff --git a/tests/auto/qjniobject/qjniobject.pro b/tests/auto/qjniobject/qjniobject.pro
deleted file mode 100644
index 30a0a0d..0000000
--- a/tests/auto/qjniobject/qjniobject.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qjniobject
-QT += testlib androidextras
-SOURCES += tst_qjniobject.cpp