From f81e76da1e8520866616c2fe9e46547b9201f202 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 20 Oct 2014 18:16:08 +0300 Subject: Allow QtCreator to pass additional args and env vars to the application. We need them to allow developers to easily pass args and env. vars like QSG_RENDER_TIMINGS, QSG_VISUALIZE to theirs apps. The env vars and params must be base64 encoded! Change-Id: I1d781873ffdc6efd40b30543a9fd2514bbdede43 Reviewed-by: Paul Olav Tvete --- .../org/qtproject/qt5/android/QtActivityDelegate.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/android') diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index ed5be81d80..7642bc38b5 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -55,6 +55,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.ResultReceiver; import android.text.method.MetaKeyKeyListener; +import android.util.Base64; import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; @@ -660,6 +661,22 @@ public class QtActivityDelegate m_applicationParameters += "\t-qmljsdebugger=" + qmljsdebugger; } + if (extras.containsKey("extraenvvars")) { + try { + m_environmentVariables += "\t" + new String(Base64.decode(extras.getString("extraenvvars"), Base64.DEFAULT), "UTF-8"); + } catch (Exception e) { + e.printStackTrace(); + } + } + + if (extras.containsKey("extraappparams")) { + try { + m_applicationParameters += "\t" + new String(Base64.decode(extras.getString("extraappparams"), Base64.DEFAULT), "UTF-8"); + } catch (Exception e) { + e.printStackTrace(); + } + } + if (null == m_surfaces) onCreate(null); String nativeLibraryDir = QtNativeLibrariesDir.nativeLibrariesDir(m_activity); -- cgit v1.2.3