1 files changed, 2 insertions, 30 deletions
diff --git a/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp b/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp
index 4b8f1d5..47b476a 100644
--- a/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp
+++ b/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp
@@ -97,13 +97,8 @@ private slots:
     void getIntField();
 
     void cleanupTestCase();
-
-public:
-    static jclass m_activityDelegateClass;
 };
 
-jclass tst_QAndroidJniObject::m_activityDelegateClass = 0;
-
 tst_QAndroidJniObject::tst_QAndroidJniObject()
 {
 }
@@ -686,7 +681,7 @@ void tst_QAndroidJniObject::getBooleanField()
 {
     QVERIFY(m_activityDelegateClass);
 
-    QAndroidJniObject obj(m_activityDelegateClass);
+    QAndroidJniObject obj("org/qtproject/qt5/android/QtActivityDelegate");
 
     QVERIFY(obj.isValid());
     QVERIFY(!obj.getField<jboolean>("m_fullScreen"));
@@ -694,9 +689,7 @@ void tst_QAndroidJniObject::getBooleanField()
 
 void tst_QAndroidJniObject::getIntField()
 {
-    QVERIFY(m_activityDelegateClass);
-
-    QAndroidJniObject obj(m_activityDelegateClass);
+    QAndroidJniObject obj("org/qtproject/qt5/android/QtActivityDelegate");
 
     QVERIFY(obj.isValid());
     jint res = obj.getField<jint>("m_currentRotation");
@@ -704,27 +697,6 @@ void tst_QAndroidJniObject::getIntField()
     QCOMPARE(res, -1);
 }
 
-Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
-{
-    typedef union {
-        JNIEnv *nenv;
-        void *venv;
-    } _JNIEnv;
-
-    _JNIEnv uenv;
-    uenv.venv = Q_NULLPTR;
-
-    if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_6) != JNI_OK)
-        return JNI_ERR;
-
-    JNIEnv *env = uenv.nenv;
-
-    jclass clazz = env->FindClass("org/qtproject/qt5/android/QtActivityDelegate");
-    tst_QAndroidJniObject::m_activityDelegateClass = (jclass)env->NewGlobalRef(clazz);
-
-    return JNI_VERSION_1_6;
-}
-
 QTEST_APPLESS_MAIN(tst_QAndroidJniObject)
 
 #include "tst_qandroidjniobject.moc"