summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-11 21:21:05 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-11 21:21:05 (GMT)
commit75d33c70eb040b56d1dfe6c9f96cc9cbf025d83f (patch)
tree2bbfcdfb022e0eade4258c4995806763a223a416
parentf4053c19b3e5584f97cfb0eb14d4b488259291b4 (diff)
parente6134f1bb7e77d6c1441a03e4829351f3f3bca95 (diff)
downloadQt-75d33c70eb040b56d1dfe6c9f96cc9cbf025d83f.zip
Qt-75d33c70eb040b56d1dfe6c9f96cc9cbf025d83f.tar.gz
Qt-75d33c70eb040b56d1dfe6c9f96cc9cbf025d83f.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: isalpha() is unspecified for values outside uchar and EOF
-rw-r--r--tools/linguist/linguist/mainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 6e5c656..321fe8c 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -2370,7 +2370,7 @@ static bool haveMnemonic(const QString &str)
// because we get a lot of false positives.
if (c != '&' && c != ' ' && QChar(c).isPrint()) {
const ushort *pp = p;
- for (; ::isalpha(*p); p++) ;
+ for (; *p < 256 && ::isalpha(*p); p++) ;
if (pp == p || *p != ';')
return true;
// This looks like a HTML &entity;, so ignore it. As a HTML string