3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index ab31617900..7b1182066d 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -320,7 +320,7 @@ namespace QtAndroid
     int createSurface(AndroidSurfaceClient *client, const QRect &geometry, bool onTop, int imageDepth)
     {
         QJniEnvironment env;
-        if (!env)
+        if (!env.jniEnv())
             return -1;
 
         m_surfacesMutex.lock();
@@ -383,7 +383,7 @@ namespace QtAndroid
             return;
 
         QJniEnvironment env;
-        if (!env)
+        if (!env.jniEnv())
             return;
         jint x = 0, y = 0, w = -1, h = -1;
         if (!geometry.isNull()) {
@@ -412,7 +412,7 @@ namespace QtAndroid
         }
 
         QJniEnvironment env;
-        if (env)
+        if (env.jniEnv())
             env->CallStaticVoidMethod(m_applicationClass,
                                       m_destroySurfaceMethodID,
                                       surfaceId);
diff --git a/src/plugins/platforms/android/qandroidplatformmenu.cpp b/src/plugins/platforms/android/qandroidplatformmenu.cpp
index 1ac836faf2..8d79331f03 100644
--- a/src/plugins/platforms/android/qandroidplatformmenu.cpp
+++ b/src/plugins/platforms/android/qandroidplatformmenu.cpp
@@ -155,7 +155,7 @@ void QAndroidPlatformMenu::showPopup(const QWindow *parentWindow, const QRect &t
     Q_UNUSED(parentWindow);
     Q_UNUSED(item);
     setVisible(true);
-    QtAndroidMenu::showContextMenu(this, targetRect, QJniEnvironment());
+    QtAndroidMenu::showContextMenu(this, targetRect, QJniEnvironment().jniEnv());
 }
 
 QPlatformMenuItem *QAndroidPlatformMenu::menuItemForTag(quintptr tag) const
diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
index f69e9e389f..2020f02456 100644
--- a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
@@ -176,7 +176,7 @@ void QAndroidPlatformOpenGLWindow::createEgl(EGLConfig config)
 {
     clearEgl();
     QJniEnvironment env;
-    m_nativeWindow = ANativeWindow_fromSurface(env, m_androidSurfaceObject.object());
+    m_nativeWindow = ANativeWindow_fromSurface(env.jniEnv(), m_androidSurfaceObject.object());
     m_androidSurfaceObject = QJniObject();
     m_eglSurface = eglCreateWindowSurface(m_eglDisplay, config, m_nativeWindow, NULL);
     m_format = q_glFormatFromConfig(m_eglDisplay, config, window()->requestedFormat());