diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java index a93889c03dc..64f0414c584 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java @@ -86,10 +86,6 @@ class QtActivityLoader extends QtLoader { return; } - String intentArgs = intent.getStringExtra("applicationArguments"); - if (intentArgs != null) - appendApplicationParameters(intentArgs); - Bundle extras = intent.getExtras(); if (extras == null) { Log.w(QtTAG, "Null extras from the Activity's intent."); diff --git a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedLoader.java index 03268f8d2c5..bbc33eef613 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedLoader.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedLoader.java @@ -17,6 +17,8 @@ class QtEmbeddedLoader extends QtLoader { String stylePath = ExtractStyle.setup(context, "minimal", displayDensity); setEnvironmentVariable("ANDROID_STYLE_PATH", stylePath); setEnvironmentVariable("QT_ANDROID_NO_EXIT_CALL", String.valueOf(true)); + + extractContextMetaData(context); } static QtEmbeddedLoader getEmbeddedLoader(Context context) throws IllegalArgumentException { diff --git a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java index 8ea5f526020..654cbc9397c 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java @@ -7,6 +7,7 @@ package org.qtproject.qt.android; import android.annotation.SuppressLint; import android.app.Activity; import android.app.Service; +import android.content.Intent; import android.content.ComponentName; import android.content.Context; import android.content.ContextWrapper; @@ -110,6 +111,12 @@ abstract class QtLoader { setEnvironmentVariable("QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED", isBackgroundRunningBlocked()); setEnvironmentVariable("QTRACE_LOCATION", getMetaData("android.app.trace_location")); appendApplicationParameters(getMetaData("android.app.arguments")); + + if (context instanceof Activity) { + Intent intent = ((Activity) context).getIntent(); + if (intent != null) + appendApplicationParameters(intent.getStringExtra("applicationArguments")); + } } private String isBackgroundRunningBlocked() {