1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure we quit qt when the service is destroyed

Browse Source 
Task-number: QTBUG-58471
Change-Id: I37f162717f57323136811a8f80d53e3c3b7d6f22
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
This commit is contained in:
BogDan Vatra 2016-12-13 10:02:15 +02:00
parent 41750492db
commit 1ab60b0430
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/android/jar/src/org/qtproject/qt5/android/QtNative.java
View File

@ -348,6 +348,7 @@ public class QtNative
// application methods // application methods
public static native void startQtApplication(String params, String env); public static native void startQtApplication(String params, String env);
public static native boolean startQtAndroidPlugin(); public static native boolean startQtAndroidPlugin();
public static native void quitQtCoreApplication();
public static native void quitQtAndroidPlugin(); public static native void quitQtAndroidPlugin();
public static native void terminateQt(); public static native void terminateQt();
// application methods // application methods

2
src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java
View File

@ -185,6 +185,6 @@ public class QtServiceDelegate
public void onDestroy() public void onDestroy()
{ {
QtNative.setService(null, null); QtNative.quitQtCoreApplication();
} }
} }

7
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -533,6 +533,12 @@ static jboolean startQtApplication(JNIEnv *env, jobject /*object*/, jstring para
return pthread_create(&m_qtAppThread, nullptr, startMainMethod, nullptr) == 0; return pthread_create(&m_qtAppThread, nullptr, startMainMethod, nullptr) == 0;
} }
static void quitQtCoreApplication(JNIEnv *env, jclass /*clazz*/)
{
Q_UNUSED(env);
QCoreApplication::quit();
}
static void quitQtAndroidPlugin(JNIEnv *env, jclass /*clazz*/) static void quitQtAndroidPlugin(JNIEnv *env, jclass /*clazz*/)
{ {
Q_UNUSED(env); Q_UNUSED(env);
@ -733,6 +739,7 @@ static JNINativeMethod methods[] = {
{"startQtAndroidPlugin", "()Z", (void *)startQtAndroidPlugin}, {"startQtAndroidPlugin", "()Z", (void *)startQtAndroidPlugin},
{"startQtApplication", "(Ljava/lang/String;Ljava/lang/String;)V", (void *)startQtApplication}, {"startQtApplication", "(Ljava/lang/String;Ljava/lang/String;)V", (void *)startQtApplication},
{"quitQtAndroidPlugin", "()V", (void *)quitQtAndroidPlugin}, {"quitQtAndroidPlugin", "()V", (void *)quitQtAndroidPlugin},
{"quitQtCoreApplication", "()V", (void *)quitQtCoreApplication},
{"terminateQt", "()V", (void *)terminateQt}, {"terminateQt", "()V", (void *)terminateQt},
{"setDisplayMetrics", "(IIIIDDDD)V", (void *)setDisplayMetrics}, {"setDisplayMetrics", "(IIIIDDDD)V", (void *)setDisplayMetrics},
{"setSurface", "(ILjava/lang/Object;II)V", (void *)setSurface}, {"setSurface", "(ILjava/lang/Object;II)V", (void *)setSurface},