Merge branch 'stable' into dev

Change-Id: I06694436322a7810a163b27b8a059cee2b046f06

5 files changed, 50 insertions, 13 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 1799cf6a24..8617b17419 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -150,15 +150,20 @@ QString QCoreApplicationPrivate::macMenuBarName()
 #endif
 QString QCoreApplicationPrivate::appName() const
 {
-    static QString applName;
+    static QBasicMutex applicationNameMutex;
+    QMutexLocker locker(&applicationNameMutex);
+
+    if (applicationName.isNull()) {
 #ifdef Q_OS_MAC
-    applName = macMenuBarName();
+        applicationName = macMenuBarName();
 #endif
-    if (applName.isEmpty() && argv[0]) {
-        char *p = strrchr(argv[0], '/');
-        applName = QString::fromLocal8Bit(p ? p + 1 : argv[0]);
+        if (applicationName.isEmpty() && argv[0]) {
+            char *p = strrchr(argv[0], '/');
+            applicationName = QString::fromLocal8Bit(p ? p + 1 : argv[0]);
+        }
     }
-    return applName;
+
+    return applicationName;
 }
 #endif
 
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index 6a3bea9c9e..477b8cfcfe 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -83,6 +83,7 @@ public:
     ~QCoreApplicationPrivate();
 
     QString appName() const;
+    mutable QString applicationName;
 
 #ifdef Q_OS_MAC
     static QString macMenuBarName();
diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp
index 17678fcbba..d1113e4eae 100644
--- a/src/corelib/kernel/qjni.cpp
+++ b/src/corelib/kernel/qjni.cpp
@@ -70,16 +70,24 @@ static jclass getCachedClass(JNIEnv *env, const char *className)
     QString key = QLatin1String(className);
     QHash<QString, jclass>::iterator it = cachedClasses->find(key);
     if (it == cachedClasses->end()) {
-        jclass c = env->FindClass(className);
+        QJNIObjectPrivate classLoader = QtAndroidPrivate::classLoader();
+        if (!classLoader.isValid())
+            return 0;
+
+        QJNIObjectPrivate stringName = QJNIObjectPrivate::fromString(QLatin1String(className));
+        QJNIObjectPrivate classObject = classLoader.callObjectMethod("loadClass",
+                                                                     "(Ljava/lang/String;)Ljava/lang/Class;",
+                                                                     stringName.object());
         if (env->ExceptionCheck()) {
-            c = 0;
 #ifdef QT_DEBUG
             env->ExceptionDescribe();
 #endif // QT_DEBUG
             env->ExceptionClear();
         }
-        if (c)
-            clazz = static_cast<jclass>(env->NewGlobalRef(c));
+
+        if (classObject.isValid())
+            clazz = static_cast<jclass>(env->NewGlobalRef(classObject.object()));
+
         cachedClasses->insert(key, clazz);
     } else {
         clazz = it.value();
@@ -160,10 +168,12 @@ QJNIEnvironmentPrivate::QJNIEnvironmentPrivate()
     : jniEnv(0)
 {
     JavaVM *vm = QtAndroidPrivate::javaVM();
-    if (vm->GetEnv((void**)&jniEnv, JNI_VERSION_1_6) != JNI_EDETACHED)
-        return;
+    if (vm->GetEnv((void**)&jniEnv, JNI_VERSION_1_6) == JNI_EDETACHED) {
+        if (vm->AttachCurrentThread(&jniEnv, 0) < 0)
+            return;
+    }
 
-    if (vm->AttachCurrentThread(&jniEnv, 0) < 0)
+    if (!jniEnv)
         return;
 
     if (!refCount->hasLocalData())
diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp
index a95194b66a..fbcd0606e6 100644
--- a/src/corelib/kernel/qjnihelpers.cpp
+++ b/src/corelib/kernel/qjnihelpers.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 static JavaVM *g_javaVM = Q_NULLPTR;
 static jobject g_jActivity = Q_NULLPTR;
+static jobject g_jClassLoader = Q_NULLPTR;
 
 static inline bool exceptionCheck(JNIEnv *env)
 {
@@ -79,6 +80,20 @@ jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
     if (exceptionCheck(env))
         return JNI_ERR;
 
+
+
+    jmethodID classLoaderMethodID = env->GetStaticMethodID(jQtNative,
+                                                           "classLoader",
+                                                           "()Ljava/lang/ClassLoader;");
+
+    if (exceptionCheck(env))
+        return JNI_ERR;
+
+    jobject classLoader = env->CallStaticObjectMethod(jQtNative, classLoaderMethodID);
+    if (exceptionCheck(env))
+        return JNI_ERR;
+
+    g_jClassLoader = env->NewGlobalRef(classLoader);
     g_jActivity = env->NewGlobalRef(activity);
     g_javaVM = vm;
 
@@ -96,4 +111,9 @@ JavaVM *QtAndroidPrivate::javaVM()
     return g_javaVM;
 }
 
+jobject QtAndroidPrivate::classLoader()
+{
+    return g_jClassLoader;
+}
+
 QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qjnihelpers_p.h b/src/corelib/kernel/qjnihelpers_p.h
index 8719ae044b..39059db215 100644
--- a/src/corelib/kernel/qjnihelpers_p.h
+++ b/src/corelib/kernel/qjnihelpers_p.h
@@ -63,6 +63,7 @@ namespace QtAndroidPrivate
     Q_CORE_EXPORT jobject activity();
     Q_CORE_EXPORT JavaVM *javaVM();
     Q_CORE_EXPORT jint initJNI(JavaVM *vm, JNIEnv *env);
+    jobject classLoader();
 }
 
 QT_END_NAMESPACE