From: Ivailo Monev <xakepa10@gmail.com>
Date: Sun, 24 Jan 2021 17:42:13 +0000 (+0200)
Subject: prefix setlocale() in setupLocaleMapper()
X-Git-Tag: 4.12.0~2703
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aa48e78b70133595d5d786895c28b5ad50bfc953;p=kde%2FKatie.git

prefix setlocale() in setupLocaleMapper()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/src/core/codecs/qtextcodec.cpp b/src/core/codecs/qtextcodec.cpp
index ac4cb8e75..45b514131 100644
--- a/src/core/codecs/qtextcodec.cpp
+++ b/src/core/codecs/qtextcodec.cpp
@@ -144,7 +144,7 @@ static void setupLocaleMapper()
         // First part is getting that locale name.  First try setlocale() which
         // definitely knows it, but since we cannot fully trust it, get ready
         // to fall back to environment variables.
-        const QByteArray ctype = setlocale(LC_CTYPE, 0);
+        const QByteArray ctype = ::setlocale(LC_CTYPE, 0);
 
         // Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
         // environment variables.