Merge remote-tracking branch 'origin/5.8' into 5.9

Change-Id: I4788bc037c55c48563ffd4ba9633a22aa1d12f22

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 b6dbd82597..c74e38d997 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();
     }
 }