Changeset 421 for trunk/src

Timestamp:

Dec 11, 2009, 7:15:30 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

Fixed bootstrab.lib build (another r419 QString regression).

File:

• trunk/src/corelib/tools/qstring.cpp (modified) (2 diffs)

trunk/src/corelib/tools/qstring.cpp

@@ -4576 +4576 @@
     }
 #elif defined(Q_OS_OS2) && !defined(QT_NO_TEXTCODEC)
+#if !defined(QT_NO_THREAD)
     static QAtomicPointer<void> localeObj;
     if (!localeObj) {
@@ -4583 +4584 @@
             UniFreeLocaleObject(lo); // we are too late
     }
+#else
+    static LocaleObject localeObj = 0;
+    if (!localeObj)
+        UniCreateLocaleObject(UNI_UCS_STRING_POINTER, (UniChar *)L"", &localeObj);
+#endif
     if (localeObj) {
         // note: we assume that data1 and data2 are zero-terminated (to avoid