Changeset 635 for trunk/src

Timestamp:

Mar 5, 2010, 12:31:57 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

general: QLocale: Fixed broken tools builds.

File:

• trunk/src/corelib/tools/qlocale.cpp (modified) (3 diffs)

trunk/src/corelib/tools/qlocale.cpp

@@ -372 +372 @@
 static uint default_number_options = 0;
 
-#ifndef QT_NO_SYSTEMLOCALE
 static QByteArray envVarLocale()
 {
-    static QByteArray lang = 0;
-#ifdef Q_OS_UNIX
+    QByteArray lang;
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
     lang = qgetenv("LC_ALL");
+#if defined(Q_OS_UNIX)
     if (lang.isNull())
         lang = qgetenv("LC_NUMERIC");
+#endif
     if (lang.isNull())
 #endif
@@ -386 +387 @@
 }
 
+#if defined(Q_OS_OS2)
+// Gets the system locale name. Also used by QString::localeAwareCompare() so
+// must be available in QT_NO_SYSTEMLOCALE mode.
+Q_CORE_EXPORT QString qt_system_locale_name()
+{
+    QString locale = QString::fromLatin1(envVarLocale());
+    if (locale.isEmpty()) {
+        // get the locale from the system country code
+        COUNTRYCODE code = { 0, 0 };
+        COUNTRYINFO info;
+        ULONG actual;
+        APIRET arc = DosQueryCtryInfo(sizeof(info), &code, &info, &actual);
+        if (arc == NO_ERROR) {
+            UniChar localeName[8];
+            if (UniMapCtryToLocale(info.country, localeName,
+                                   sizeof(localeName)) == ULS_SUCCESS)
+                locale = QString::fromUtf16(localeName);
+        }
+    }
+
+    return locale;
+}
+#endif
+
+#ifndef QT_NO_SYSTEMLOCALE
 
 #if defined(Q_OS_WIN)
@@ -944 +970 @@
 ** Wrappers for OS/2 locale system functions
 */
-
-Q_CORE_EXPORT QString qt_system_locale_name()
-{
-    QString locale = QString::fromLatin1(envVarLocale());
-    if (locale.isEmpty()) {
-        // get the locale from the system country code
-        COUNTRYCODE code = { 0, 0 };
-        COUNTRYINFO info;
-        ULONG actual;
-        APIRET arc = DosQueryCtryInfo(sizeof(info), &code, &info, &actual);
-        if (arc == NO_ERROR) {
-            UniChar localeName[8];
-            if (UniMapCtryToLocale(info.country, localeName,
-                                   sizeof(localeName)) == ULS_SUCCESS)
-                locale = QString::fromUtf16(localeName);
-        }
-    }
-
-    return locale;
-}
 
 /*!