From 590e19acb70c85ed4daadf3e118f300ccec8eea2 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Fri, 19 Nov 2021 16:54:42 +0100
Subject: [PATCH] QmlDesigner: Enable environment variable usage

Change-Id: I91ada6d7dfa5e8376333c5ef27fbd72a5484e4f4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/plugins/android/androidqmlpreviewworker.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp
index ced1c06f5fa..007562823a7 100644
--- a/src/plugins/android/androidqmlpreviewworker.cpp
+++ b/src/plugins/android/androidqmlpreviewworker.cpp
@@ -35,6 +35,7 @@
 
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
+#include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
@@ -424,9 +425,14 @@ bool AndroidQmlPreviewWorker::startPreviewApp()
     const QDir destDir(apkInfo()->uploadDir);
     const QString qmlrcPath = destDir.filePath(m_uploadInfo.uploadPackage.baseName()
                                                + packageSuffix);
-    const QStringList command{"am", "start",
-                              "-n", apkInfo()->activityId,
-                              "-e", "extraappparams", QLatin1String(qmlrcPath.toUtf8().toBase64())};
+    const QStringList envVars = m_rc->aspect<EnvironmentAspect>()->environment().toStringList();
+
+    const QStringList command {
+        "am", "start",
+        "-n", apkInfo()->activityId,
+        "-e", "extraappparams", QLatin1String(qmlrcPath.toUtf8().toBase64()),
+        "-e", "extraenvvars", QLatin1String(envVars.join('\t').toUtf8().toBase64())
+    };
     const SdkToolResult result = runAdbShellCommand(command);
     if (result.success())
         appendMessage(tr("%1 is running.").arg(apkInfo()->name), NormalMessageFormat);