diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-07-24 17:57:24 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-07-30 02:35:12 +0100 |
| commit | e9b45ff67d32fdc27950a51135b6dabada8334e7 (patch) | |
| tree | de99cd760c8292ee1dd334e23e1e5cc43e90dfbd /recipes-qt/qte/qte-2.3.10/encoding.patch | |
| download | meta-opie-e9b45ff67d32fdc27950a51135b6dabada8334e7.tar.gz | |
initial commit of meta-opie
Populate the repository with files from OpenEmbedded at revision
45edf621296daf150c72b876d720861235e5762e - no changes, only rearranged
the directory structure to match the new oe-core style and added
COPYING.MIT and README.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'recipes-qt/qte/qte-2.3.10/encoding.patch')
| -rw-r--r-- | recipes-qt/qte/qte-2.3.10/encoding.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes-qt/qte/qte-2.3.10/encoding.patch b/recipes-qt/qte/qte-2.3.10/encoding.patch new file mode 100644 index 0000000..13a4828 --- /dev/null +++ b/recipes-qt/qte/qte-2.3.10/encoding.patch @@ -0,0 +1,34 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.9-snapshot-20041211/src/tools/qstring.cpp~encoding ++++ qt-2.3.9-snapshot-20041211/src/tools/qstring.cpp +@@ -14469,7 +14469,11 @@ + return qt_winQString2MB( *this ); + #endif + #ifdef _WS_QWS_ +- return utf8(); // ##### if there is ANY 8 bit format supported? ++ QTextCodec* codec = QTextCodec::codecForLocale(); ++ return codec ++ ? codec->fromUnicode(*this) ++ : utf8(); ++ //return latin1(); // ##### if there is ANY 8 bit format supported? + #endif + #endif + } +@@ -14515,7 +14519,12 @@ + return qt_winMB2QString( local8Bit ); + #endif + #ifdef _WS_QWS_ +- return fromUtf8(local8Bit,len); ++ QTextCodec* codec = QTextCodec::codecForLocale(); ++ if( len < 0) len = qstrlen(local8Bit); ++ return codec ++ ? codec->toUnicode(local8Bit, len) ++ : QString::fromUtf8(local8Bit,len); ++// return fromLatin1(local8Bit,len); + #endif + #endif // QT_NO_TEXTCODEC + } |