Skip to content

Commit 83074e1

Browse files
committed
Android: Disable Qt's Activity exit path
Reason: When our MainActivity is destroyed we want to initiate saving in Service if we allow call to this method, Qt will kill the process prematurely. (This patches QtActivity which isn't compile until the app is built. So it won't require recompilation.)
1 parent 2efb523 commit 83074e1

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 392dd60c48b1009290c9c84821a58784dc185cac Mon Sep 17 00:00:00 2001
2+
From: Sharaf Zaman <[email protected]>
3+
Date: Fri, 9 Apr 2021 13:58:56 +0000
4+
Subject: [PATCH] Android: Don't invoke Qt's exit path
5+
6+
---
7+
.../java/src/org/qtproject/qt5/android/bindings/QtActivity.java | 1 -
8+
1 file changed, 1 deletion(-)
9+
10+
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java
11+
index 3348527b3c..8a61f2e9db 100644
12+
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java
13+
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java
14+
@@ -396,7 +396,6 @@ public class QtActivity extends Activity
15+
protected void onDestroy()
16+
{
17+
super.onDestroy();
18+
- QtApplication.invokeDelegate();
19+
}
20+
//---------------------------------------------------------------------------
21+
22+
--
23+
2.31.0
24+

3rdparty/ext_qt/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ elseif (ANDROID)
156156
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0055-Android-prevent-out-of-order-events.patch
157157
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0056-Android-check-if-the-Uri-is-writable.patch
158158
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0056-Android-Give-preference-to-certain-WindowTypes.patch
159+
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0001-Android-Don-t-invoke-Qt-s-exit-path.patch
159160

160161
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0105-Android-Don-t-hide-Menubar-even-if-MenuKey-is-presen.patch
161162
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/106-Android-don-t-use-getExternalStorageDirectory-and-ge.patch

0 commit comments

Comments
 (0)