summaryrefslogtreecommitdiffstats
path: root/src/android/jar/src/org/qtproject/qt/android/QtNative.java
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2023-11-26 00:05:06 +0200
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2023-11-30 17:26:26 +0200
commitee874e7ca8b38a7f3034409688dc2586b09ba4d6 (patch)
tree1a10c7c4910eb8faff366d9644f6fd1b0bfb810b /src/android/jar/src/org/qtproject/qt/android/QtNative.java
parentb044323c1656aeeec508afab8457755cc1e8c587 (diff)
Android: accept both spaces and tabs separators for env vars and args
The requirement for separating the app args by tabs only is not justified, since the the args are passed as a string to C++ where QProcess::splitCommand() is used to get a list of single args and that knows how to handle the parsing properly anyway. As for env vars, QtLoader currently expects env vars to be separated by tabs only, however, to account for different use cases, it should handle both tabs and spaces. Task-number: QTBUG-115016 Task-number: QTBUG-106478 Task-number: QTQAINFRA-5703 Change-Id: I58258861477776b82294a4c2603b230f178f16a6 Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
Diffstat (limited to 'src/android/jar/src/org/qtproject/qt/android/QtNative.java')
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtNative.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtNative.java b/src/android/jar/src/org/qtproject/qt/android/QtNative.java
index b321e1e052..ee67362fec 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtNative.java
@@ -278,11 +278,11 @@ class QtNative
runAction(() -> view.setVisibility(visible ? View.VISIBLE : View.GONE));
}
- public static void startApplication(ArrayList<String> params, String mainLib)
+ public static void startApplication(String params, String mainLib)
{
synchronized (m_mainActivityMutex) {
m_qtThread.run(() -> {
- final String qtParams = mainLib + "\t" + String.join("\t", params);
+ final String qtParams = mainLib + " " + params;
if (!startQtAndroidPlugin(qtParams))
Log.e(QtTAG, "An error occurred while starting the Qt Android plugin");
});