summaryrefslogtreecommitdiffstats
path: root/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java')
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java
index 1a4b0c6703..f3e23b9da1 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java
@@ -21,7 +21,7 @@ import android.view.Window;
public class QtActivityBase extends Activity
{
- private String m_applicationParams = null;
+ private String m_applicationParams = "";
private boolean m_isCustomThemeSet = false;
private boolean m_retainNonConfigurationInstance = false;
@@ -50,11 +50,16 @@ public class QtActivityBase extends Activity
intent.putExtra(extraSourceInfoKey, sourceInformation);
}
- // Append any parameters to your application,
- // the parameters must be "\t" separated.
+ // Append any parameters to your application.
+ // Either a whitespace or a tab is accepted as a separator between parameters.
/** @noinspection unused*/
public void appendApplicationParameters(String params)
{
+ if (params == null || params.isEmpty())
+ return;
+
+ if (!m_applicationParams.isEmpty())
+ m_applicationParams += " ";
m_applicationParams += params;
}
@@ -95,7 +100,7 @@ public class QtActivityBase extends Activity
addReferrer(getIntent());
QtActivityLoader loader = new QtActivityLoader(this);
- loader.setApplicationParameters(m_applicationParams);
+ loader.appendApplicationParameters(m_applicationParams);
loader.loadQtLibraries();
m_delegate.startNativeApplication(loader.getApplicationParameters(),