1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qEnvironmentVariable: avoid a temporary QByteArray

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2024-12-31 16:41:22 -03:00 committed by Qt Cherry-pick Bot
parent 01edc916d2
commit 36d260014f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/global/qtenvironmentvariables.cpp
View File

@ -126,8 +126,9 @@ QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
buffer.chop(1); buffer.chop(1);
return buffer; return buffer;
#else #else
QByteArray value = qgetenv(varName); const auto locker = qt_scoped_lock(environmentMutex);
if (value.isNull()) const char *value = ::getenv(varName);
if (!value)
return defaultValue; return defaultValue;
// duplicated in qfile.h (QFile::decodeName) // duplicated in qfile.h (QFile::decodeName)
#if defined(Q_OS_DARWIN) #if defined(Q_OS_DARWIN)