Changeset 340 for trunk/src

Timestamp:

Nov 23, 2009, 1:22:05 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed two text codec plugin related issues [vendor bug]:

• codec plugins were never searched in the application's directroy;
• even with the above fix applied, the codec requested in LANG would have never been set if it were in the application's directory.

Location:

trunk/src/corelib

Files:

• codecs/qtextcodec.cpp (modified) (2 diffs)
• kernel/qcoreapplication.cpp (modified) (1 diff)

trunk/src/corelib/codecs/qtextcodec.cpp

@@ -743 +743 @@
 }
 
+static bool codecForLocaleSet = false;
+void qt_resetCodecForLocale()
+{
+    // if QTextCodec::codecForLocale() was called, we assume that the user has
+    // explicitly set the codec he wants for the locale and don't attempt to
+    // autodetect it again
+    if (!codecForLocaleSet)
+        setupLocaleMapper();
+}
+
 /*!
     \class QTextCodec
@@ -1064 +1074 @@
         return;
 #endif
+    codecForLocaleSet = true;
     localeMapper = c;
     if (!localeMapper)

trunk/src/corelib/kernel/qcoreapplication.cpp

@@ -497 +497 @@
         d->appendApplicationPathToLibraryPaths();
     }
+    // QCoreApplication is most likely constructed after static QFactroyLoader
+    // instances (such as the one for QTextCodecFactoryInterface_iid). Hence, we
+    // need to inform these instances that we have added new paths.
+    QFactoryLoader::refreshAll();
+#ifndef QT_NO_TEXTCODECPLUGIN
+    // libaryPaths() calls QTextCodec::codecForLocale() before it adds the
+    // appiication path to the library path. As a result, if this path contains
+    // a plugin for the codec requested in LANG, this request will be ignored
+    // because the locale would have been already set by codecForLocale()
+    // Request codec auto-detection again.
+    extern void qt_resetCodecForLocale(); // qtextcodec.cpp
+    qt_resetCodecForLocale();
+#endif
 #endif