diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:02 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:03 +0100 |
commit | 9c055e8e47d9411a8f34abe6872e4bfd942cc372 (patch) | |
tree | 895e139477c88a064a993f035afec614de9dafc7 /src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java | |
parent | d08e0e861acadf3a354d3833dd5623ef71fa7a4b (diff) | |
parent | 76010f4af8c9a59a20c489d70c7f99b802f9721f (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iaec2e57d6bf33355ddfa61d25133580a8740335f
Diffstat (limited to 'src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java | 4 |
1 files changed, 4 insertions, 0 deletions
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 195ec376c9..ae06fa6268 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java @@ -187,6 +187,10 @@ public class QtServiceDelegate public void onDestroy() { QtNative.quitQtCoreApplication(); + QtNative.terminateQt(); + QtNative.setService(null, null); + QtNative.m_qtThread.exit(); + System.exit(0); } public IBinder onBind(Intent intent) |