From 36d260014fe28be17259abee7547b660669dfdc4 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 31 Dec 2024 16:41:22 -0300
Subject: [PATCH] qEnvironmentVariable: avoid a temporary QByteArray

Because we don't need one. I guess I was just lazy.

Amends b12fd1fa9d0b64e3cb66fa68c85392dbde8e175b ("Long live
qEnvironmentVariable()").

Pick-to: 6.8
Change-Id: I5b9141c5a32f9d784e0bfffdc3e4d742790aebdd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit ce95c26034cc5b3ae8094c1521221e5b2f13ecfa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/global/qtenvironmentvariables.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/corelib/global/qtenvironmentvariables.cpp b/src/corelib/global/qtenvironmentvariables.cpp
index 1afdef8912b..58682a2406c 100644
--- a/src/corelib/global/qtenvironmentvariables.cpp
+++ b/src/corelib/global/qtenvironmentvariables.cpp
@@ -126,8 +126,9 @@ QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
     buffer.chop(1);
     return buffer;
 #else
-    QByteArray value = qgetenv(varName);
-    if (value.isNull())
+    const auto locker = qt_scoped_lock(environmentMutex);
+    const char *value = ::getenv(varName);
+    if (!value)
         return defaultValue;
 // duplicated in qfile.h (QFile::decodeName)
 #if defined(Q_OS_DARWIN)