OSDN Git Service

compare language, country and script instead of address in localePrivateIndex() function
authorIvailo Monev <xakepa10@laimg.moc>
Mon, 5 Aug 2019 12:28:31 +0000 (12:28 +0000)
committerIvailo 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

index e31da6e..deb363b 100644 (file)
@@ -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;