summaryrefslogtreecommitdiffstats
path: root/src/codecs/qtextcodec.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-28 15:51:58 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-28 15:51:58 -0500
commitfe7969ef886d7287fa959929ddd33fbad8407884 (patch)
tree589aacc109d27561a5188bb46bce27c78bad8f5b /src/codecs/qtextcodec.cpp
parentdba8a853b65e5707e48450e5085e0ff0513b4203 (diff)
downloadtqt3-fe7969ef886d7287fa959929ddd33fbad8407884.tar.gz
tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.zip
Automated update from Qt3
Diffstat (limited to 'src/codecs/qtextcodec.cpp')
-rw-r--r--src/codecs/qtextcodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index 331688da..6de93356 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -2844,7 +2844,7 @@ static void setupLocaleMapper()
localeMapper = checkForCodec( lang );
// 5. "@euro"
- if ( !localeMapper && ctype && strstr( ctype, "@euro" ) || lang && strstr( lang, "@euro" ) )
+ if ( ( !localeMapper && ctype && strstr( ctype, "@euro" ) ) || (lang && strstr( lang, "@euro" ) ) )
localeMapper = TQTextCodec::codecForName( "ISO 8859-15" );
// 6. guess locale from ctype unless ctype is "C"