Changeset 340

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 @@
 }
 
+
+
+
+
+
+
+
+
+
+
 /*!
     \class QTextCodec
@@ -1064 +1074 @@
         return;
 #endif
+
     localeMapper = c;
     if (!localeMapper)

trunk/src/corelib/kernel/qcoreapplication.cpp

@@ -497 +497 @@
         d->appendApplicationPathToLibraryPaths();
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif