summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-07-21 18:02:39 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-07-21 18:02:39 (GMT)
commit9c2def85dc30eccea8e22e426a677ad869b59ad7 (patch)
tree30ba99e31f657e971f5ec4c422c1607fa678fad6
parent88b4736d8085db27abbe54ac6ece86f9badf154a (diff)
parent9e31f40c510d3efc3676cff2186410d38d539a4d (diff)
downloadQt-9c2def85dc30eccea8e22e426a677ad869b59ad7.zip
Qt-9c2def85dc30eccea8e22e426a677ad869b59ad7.tar.gz
Qt-9c2def85dc30eccea8e22e426a677ad869b59ad7.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
-rw-r--r--tools/qdoc3/cppcodemarker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index 9591801..2067716 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -953,7 +953,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
ident += ch;
finish = i;
readChar();
- } while (isalnum(ch) || ch == '_');
+ } while (ch >= 0 && isalnum(ch) || ch == '_');
if (classRegExp.exactMatch(ident)) {
tag = QLatin1String("type");