From kde-commits Wed Jul 15 15:25:26 2009 From: Andreas Pakulat Date: Wed, 15 Jul 2009 15:25:26 +0000 To: kde-commits Subject: branches/KDE/4.3/kdelibs/kdecore/localization Message-Id: <1247671526.840485.32295.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=124767153328740 SVN commit 997227 by apaku: Backport r997224: Make sure we get a proper iso-8859-1 codec in all cases (this makes sure the qstricmp in qtextcodec.cpp::nameMatch() kicks in). Problem is that QString::toLower() can produce differing results depending on the users locale BUG:200287 M +2 -2 kcharsets.cpp --- branches/KDE/4.3/kdelibs/kdecore/localization/kcharsets.cpp #997226:997227 @@ -724,7 +724,7 @@ if ( codec ) return codec; else - return QTextCodec::codecForName( "iso8859-1" ); + return QTextCodec::codecForName( "iso-8859-1" ); } QTextCodec* KCharsets::codecForName(const QString &n, bool &ok) const @@ -739,7 +739,7 @@ else { ok = false; - return QTextCodec::codecForName( "iso8859-1" ); + return QTextCodec::codecForName( "iso-8859-1" ); } }