From a0958ee26f45135210417f393027c3a9a18651a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Mu=C4=87ko?= Date: Thu, 1 Sep 2022 11:23:26 +0200 Subject: [PATCH] Utils: Read env variable using qtc function in MacroExpander Change-Id: I2570a526d8b0b8a115b3e06a2d672f7b70d2d970 Reviewed-by: Alessandro Portale --- src/libs/utils/macroexpander.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp index 6e8d9e85c0c..85a9ee53aa3 100644 --- a/src/libs/utils/macroexpander.cpp +++ b/src/libs/utils/macroexpander.cpp @@ -5,6 +5,7 @@ #include "algorithm.h" #include "commandline.h" +#include "environment.h" #include "qtcassert.h" #include "stringutils.h" @@ -479,8 +480,9 @@ public: GlobalMacroExpander() { setDisplayName(MacroExpander::tr("Global variables")); - registerPrefix("Env", MacroExpander::tr("Access environment variables."), - [](const QString &value) { return QString::fromLocal8Bit(qgetenv(value.toLocal8Bit())); }); + registerPrefix("Env", + MacroExpander::tr("Access environment variables."), + [](const QString &value) { return qtcEnvironmentVariable(value); }); } };