diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2016-12-13 10:02:15 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2017-03-27 12:20:40 +0000 |
| commit | 1ab60b0430f2b57418ee4954fcfa43e1e14766fc (patch) | |
| tree | db70d956405f13078700fbb08350ba1cd55fcc23 /src/android | |
| parent | 41750492db58ca30a70a685cd6a4ee180c0b4959 (diff) | |
Make sure we quit qt when the service is destroyed
Task-number: QTBUG-58471
Change-Id: I37f162717f57323136811a8f80d53e3c3b7d6f22
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 1 | ||||
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index b7d1217e98..710648e25a 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -348,6 +348,7 @@ public class QtNative // application methods public static native void startQtApplication(String params, String env); public static native boolean startQtAndroidPlugin(); + public static native void quitQtCoreApplication(); public static native void quitQtAndroidPlugin(); public static native void terminateQt(); // application methods diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java index 5ac406c710..035a65a84c 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java @@ -185,6 +185,6 @@ public class QtServiceDelegate public void onDestroy() { - QtNative.setService(null, null); + QtNative.quitQtCoreApplication(); } } |