diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-02 11:15:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-02 11:15:03 (GMT) |
| commit | 9d17022f9f18a0c1dfc97700f694902934ad0fe7 (patch) | |
| tree | 1b1326d4fcc0732430f0d8dba11208c26b9151a0 /tools | |
| parent | cac60dcca5b4632173a8fe76a78cd2ec9bea5873 (diff) | |
| parent | aae54d0dd60ca7ac5c2b013cb2f1e5365cd9855e (diff) | |
| download | Qt-9d17022f9f18a0c1dfc97700f694902934ad0fe7.zip Qt-9d17022f9f18a0c1dfc97700f694902934ad0fe7.tar.gz Qt-9d17022f9f18a0c1dfc97700f694902934ad0fe7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Added an additional check to workaround an issue on Windows.
Diffstat (limited to 'tools')
| -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 75d6094..37c2c3a 100644 --- a/tools/qdoc3/cppcodemarker.cpp +++ b/tools/qdoc3/cppcodemarker.cpp @@ -935,7 +935,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"); |