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:
c6b24cc
)
compare language, country and script instead of address in localePrivateIndex() function
author
Ivailo Monev
<xakepa10@laimg.moc>
Mon, 5 Aug 2019 12:28:31 +0000
(12:28 +0000)
committer
Ivailo Monev
<xakepa10@laimg.moc>
Mon, 5 Aug 2019 12:28:31 +0000
(12:28 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/core/tools/qlocale.cpp
patch
|
blob
|
history
diff --git
a/src/core/tools/qlocale.cpp
b/src/core/tools/qlocale.cpp
index
e31da6e
..
deb363b
100644
(file)
--- a/
src/core/tools/qlocale.cpp
+++ b/
src/core/tools/qlocale.cpp
@@
-506,7
+506,9
@@
QDataStream &operator>>(QDataStream &ds, QLocale &l)
static quint16 localePrivateIndex(const QLocalePrivate *p)
{
for (int i = 0; i < localeTblSize; i++) {
- if (&localeTbl[i] == p)
+ if (p->m_language == localeTbl[i].m_language
+ && p->m_country == localeTbl[i].m_country
+ && p->m_script == localeTbl[i].m_script)
return i;
}
return 0;