From 3bcf55daa597888fcf0997e7ce2edd1d4c730a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tinja=20Paavosepp=C3=A4?= Date: Tue, 26 Nov 2024 14:20:52 +0200 Subject: [PATCH] Android: Quit hosting Context only when app is entirely Qt When quitting Qt, only quit the hosting Activity or Service if it's primarily a Qt app, i.e. Qt is in the driver's seat. When using QtQuick for Android, i.e. Qt is just a View, we do not want to forcefully quit Activities, that is up to the app code. Task-number: QTBUG-123711 Pick-to: 6.8 6.9 Change-Id: Ib98700be8693c3d30a296998b863b0f224c9bf69 Reviewed-by: Assam Boudjelthia --- src/plugins/platforms/android/androidjnimain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index c7f171d49d0..1089f24e9d3 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -471,7 +471,7 @@ static void startQtApplication(JNIEnv */*env*/, jclass /*clazz*/) qWarning() << "dlclose failed:" << dlerror(); } - if (m_applicationClass) + if (m_applicationClass && QtAndroid::isQtApplication()) QJniObject::callStaticMethod(m_applicationClass, "quitApp", "()V"); sem_post(&m_terminateSemaphore);