Changeset 623

Timestamp:

Mar 3, 2010, 9:22:55 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Ignore the system locale object by default as it is known to have bogus definitions for some of the regional settings and use the Qt internal locale database instead (this behavior can be overridden using environment variables, see README.OS2).

File:

• trunk/src/corelib/tools/qlocale.cpp (modified) (1 diff)

trunk/src/corelib/tools/qlocale.cpp ¶

@@ -987 +987 @@
 QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
 {
+    static bool ignoreSysLocaleObject =
+        getenv("QT_PM_NO_SYSTEM_LOCALE") || !getenv("QT_PM_SYSTEM_LOCALE");
+
+    if (ignoreSysLocaleObject)
+        return QVariant();
+
     static LocaleItem dayNames[] = {
         // 0 ... 6 (Mon - Sun)