summaryrefslogtreecommitdiffstats
path: root/src/codecs/qtextcodec.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-28 15:50:52 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-28 15:50:52 -0500
commitebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (patch)
tree2b17bdf68dd5a96e5ef742207426f65010aedac6 /src/codecs/qtextcodec.cpp
parentb129c37241b8777665c2c063713d496e43e934b2 (diff)
downloadqt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.tar.gz
qt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.zip
Fix build warnings
Thanks to Bruce Sass for the patch!
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 1a4fb32..80d0093 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 = QTextCodec::codecForName( "ISO 8859-15" );
// 6. guess locale from ctype unless ctype is "C"