diff options
| author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:38 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:38 -0500 |
| commit | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (patch) | |
| tree | 231f5c31f279d3e798702fe61e9b6bcef52b089b /src/codecs/qtextcodec.cpp | |
| parent | 6d0157ea558089bb957f35263424a405e42a6931 (diff) | |
| parent | fe7969ef886d7287fa959929ddd33fbad8407884 (diff) | |
| download | tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.tar.gz tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/codecs/qtextcodec.cpp')
| -rw-r--r-- | src/codecs/qtextcodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index 331688da7..6de93356b 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" |