3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 --- qt-2.3.9-snapshot-20041211/src/tools/qstring.cpp~encoding
7 +++ qt-2.3.9-snapshot-20041211/src/tools/qstring.cpp
8 @@ -14469,7 +14469,11 @@
9 return qt_winQString2MB( *this );
12 - return utf8(); // ##### if there is ANY 8 bit format supported?
13 + QTextCodec* codec = QTextCodec::codecForLocale();
15 + ? codec->fromUnicode(*this)
17 + //return latin1(); // ##### if there is ANY 8 bit format supported?
21 @@ -14515,7 +14519,12 @@
22 return qt_winMB2QString( local8Bit );
25 - return fromUtf8(local8Bit,len);
26 + QTextCodec* codec = QTextCodec::codecForLocale();
27 + if( len < 0) len = qstrlen(local8Bit);
29 + ? codec->toUnicode(local8Bit, len)
30 + : QString::fromUtf8(local8Bit,len);
31 +// return fromLatin1(local8Bit,len);
33 #endif // QT_NO_TEXTCODEC