OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6177706
)
prefix setlocale() in setupLocaleMapper()
author
Ivailo Monev
<xakepa10@gmail.com>
Sun, 24 Jan 2021 17:42:13 +0000
(19:42 +0200)
committer
Ivailo Monev
<xakepa10@gmail.com>
Sun, 24 Jan 2021 17:42:13 +0000
(19:42 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/core/codecs/qtextcodec.cpp
patch
|
blob
|
history
diff --git
a/src/core/codecs/qtextcodec.cpp
b/src/core/codecs/qtextcodec.cpp
index
ac4cb8e
..
45b5141
100644
(file)
--- 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.