1 files changed, 15 insertions, 6 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp
index 038fe5172a..6efd3fc631 100644
--- a/src/plugins/platforms/android/qandroidplatformintegration.cpp
+++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp
@@ -72,6 +72,12 @@ QAndroidPlatformScreen* createScreenForDisplayId(int displayId)
     return new QAndroidPlatformScreen(display);
 }
 
+static bool isValidAndroidContextForRendering()
+{
+    return QtAndroid::isQtApplication() ? QtAndroidPrivate::activity().isValid()
+                                        : QtAndroidPrivate::context().isValid();
+}
+
 } // anonymous namespace
 
 void *QAndroidPlatformNativeInterface::nativeResourceForIntegration(const QByteArray &resource)
@@ -317,9 +323,12 @@ bool QAndroidPlatformIntegration::hasCapability(Capability cap) const
         case ApplicationState: return true;
         case ThreadedPixmaps: return true;
         case NativeWidgets: return QtAndroidPrivate::activity().isValid();
-        case OpenGL: return QtAndroidPrivate::activity().isValid();
-        case ForeignWindows: return QtAndroidPrivate::activity().isValid();
-        case ThreadedOpenGL: return !needsBasicRenderloopWorkaround() && QtAndroidPrivate::activity().isValid();
+        case OpenGL:
+            return isValidAndroidContextForRendering();
+        case ForeignWindows:
+            return isValidAndroidContextForRendering();
+        case ThreadedOpenGL:
+            return !needsBasicRenderloopWorkaround() && isValidAndroidContextForRendering();
         case RasterGLSurface: return QtAndroidPrivate::activity().isValid();
         case TopStackedNativeChildWindows: return false;
         case MaximizeUsingFullscreenGeometry: return true;
@@ -341,7 +350,7 @@ QPlatformBackingStore *QAndroidPlatformIntegration::createPlatformBackingStore(Q
 
 QPlatformOpenGLContext *QAndroidPlatformIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
 {
-    if (!QtAndroidPrivate::activity().isValid())
+    if (!isValidAndroidContextForRendering())
         return nullptr;
     QSurfaceFormat format(context->format());
     format.setAlphaBufferSize(8);
@@ -384,7 +393,7 @@ QOffscreenSurface *QAndroidPlatformIntegration::createOffscreenSurface(ANativeWi
 
 QPlatformWindow *QAndroidPlatformIntegration::createPlatformWindow(QWindow *window) const
 {
-    if (!QtAndroidPrivate::activity().isValid())
+    if (!isValidAndroidContextForRendering())
         return nullptr;
 
 #if QT_CONFIG(vulkan)
@@ -537,7 +546,7 @@ void QAndroidPlatformIntegration::setScreenSize(int width, int height)
 
 Qt::ColorScheme QAndroidPlatformIntegration::m_colorScheme = Qt::ColorScheme::Light;
 
-void QAndroidPlatformIntegration::setColorScheme(Qt::ColorScheme colorScheme)
+void QAndroidPlatformIntegration::updateColorScheme(Qt::ColorScheme colorScheme)
 {
     if (m_colorScheme == colorScheme)
         return;