Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev

1 files changed, 8 insertions, 1 deletions

diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp
index a7f98bc532..694463b9d8 100644
--- a/src/corelib/kernel/qjni.cpp
+++ b/src/corelib/kernel/qjni.cpp
@@ -96,7 +96,7 @@ static jclass loadClassDotEnc(const QString &classDotEnc, JNIEnv *env)
     if (clazz != 0 || isCached)
         return clazz;
 
-    QJNIObjectPrivate classLoader = QtAndroidPrivate::classLoader();
+    QJNIObjectPrivate classLoader(QtAndroidPrivate::classLoader());
     if (!classLoader.isValid())
         return 0;
 
@@ -2239,6 +2239,13 @@ bool QJNIObjectPrivate::isValid() const
     return d->m_jobject;
 }
 
+QJNIObjectPrivate QJNIObjectPrivate::fromLocalRef(jobject lref)
+{
+    QJNIObjectPrivate o(lref);
+    QJNIEnvironmentPrivate()->DeleteLocalRef(lref);
+    return o;
+}
+
 bool QJNIObjectPrivate::isSameObject(jobject obj) const
 {
     QJNIEnvironmentPrivate env;