diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-22 12:30:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-22 12:30:23 (GMT) |
| commit | 72a71243262cd0152a92480395236486b89e0c4e (patch) | |
| tree | 8b2480e7d2d6ee3fec4c27376f65ec963472e644 | |
| parent | 84408e18ac5a5ccc69cf34832f31ef63b3ff9f11 (diff) | |
| parent | d62bb74d329b6ee5f6c52ac26e11bfe9a27f56a0 (diff) | |
| download | Qt-72a71243262cd0152a92480395236486b89e0c4e.zip Qt-72a71243262cd0152a92480395236486b89e0c4e.tar.gz Qt-72a71243262cd0152a92480395236486b89e0c4e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Added an additional check to workaround an issue on Windows.
| -rw-r--r-- | tools/qdoc3/cppcodemarker.cpp | 2 |
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"); |