From 574c966ac8ce0527e14e6cb5dc23a4a411fc8003 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 3 Oct 2024 13:53:35 +0300 Subject: [PATCH] AndroidTestRunner: forward QT_* env vars to the tests Forward QT_* env vars to the test same like QTEST_* vars, this can be useful when debugging, this would allow us to pass QT_DEBUG_PLUGINS. Pick-to: 6.8 Change-Id: I9404ff7c7276f87e3e7d9cf57fa8f5b1eed02eb7 Reviewed-by: Dimitrios Apostolou --- src/tools/androidtestrunner/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp index c1ae9192608..8269a7e411e 100644 --- a/src/tools/androidtestrunner/main.cpp +++ b/src/tools/androidtestrunner/main.cpp @@ -408,11 +408,11 @@ static bool parseTestArgs() testAppArgs = "\"%1\""_L1.arg(testAppArgs.trimmed()); const QString activityName = "%1/%2"_L1.arg(g_options.package).arg(g_options.activity); - // Pass over any testlib env vars if set + // Pass over any qt or testlib env vars if set QString testEnvVars; const QStringList envVarsList = QProcessEnvironment::systemEnvironment().toStringList(); for (const QString &var : envVarsList) { - if (var.startsWith("QTEST_"_L1)) + if (var.startsWith("QTEST_"_L1) || var.startsWith("QT_"_L1)) testEnvVars += "%1 "_L1.arg(var); }