summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2014-03-26 10:07:59 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-27 15:17:33 +0100
commitd1ed2dee51ce1843e53912e250bc75b34b5bb0da (patch)
tree9e384d7129ca2eddf18a719b979a17c92b429496
parent76eefbe8af7655f8d6979069aea07e4cb32c6ee8 (diff)
Android: REG: Fix launching intents
When the launch mode is singleInstance, then intents will not be launched as activities inside the same task, but as separate tasks, and onActivityResult() is always called immediately without any data. This is documented in various stack overflows and google group messages if you search for it on the Internet, and the singleInstance launch mode is documented as "not recommended for normal use". This broke e.g. automatic downloads of Ministro. The singleTop launch mode seems more like what we're after, and fixes both the original issue as well as the current problem with intents. Change-Id: Iab24a654a4433f979064509b1ef721db9ef352af Reviewed-by: BogDan Vatra <bogdan@kde.org>
-rw-r--r--src/android/java/AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/java/AndroidManifest.xml b/src/android/java/AndroidManifest.xml
index 1741101bc1..8e551ba7ac 100644
--- a/src/android/java/AndroidManifest.xml
+++ b/src/android/java/AndroidManifest.xml
@@ -5,7 +5,7 @@
android:name="org.qtproject.qt5.android.bindings.QtActivity"
android:label="@string/app_name"
android:screenOrientation="unspecified"
- android:launchMode="singleInstance">
+ android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>