diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-16 06:48:42 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-16 06:48:42 (GMT) |
| commit | 1c486fb2c993c966970caf377498c5d5fb8421a2 (patch) | |
| tree | 390147d4b43c53b92ca20b7e9dd0214d6aa902ec | |
| parent | ad7c537fbd4b5060141233d06b916407d7eb920f (diff) | |
| download | Qt-1c486fb2c993c966970caf377498c5d5fb8421a2.zip Qt-1c486fb2c993c966970caf377498c5d5fb8421a2.tar.gz Qt-1c486fb2c993c966970caf377498c5d5fb8421a2.tar.bz2 | |
Fix QTBUG-8090, improve original patch effectiveness.
| -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 d9c767a..22562f3 100644 --- a/tools/qdoc3/cppcodemarker.cpp +++ b/tools/qdoc3/cppcodemarker.cpp @@ -881,7 +881,7 @@ QString CppCodeMarker::addMarkUp(const QString& protectedCode, static QRegExp globalX("[\n{()=] *([a-zA-Z_][a-zA-Z_0-9]*)[ \n]*\\("); static QRegExp multiLineComment("/(?:( )?\\*(?:[^*]+|\\*(?! /))*\\*\\1/)"); multiLineComment.setMinimal(true); - static QRegExp singleLineCommentLine("(?:^|\n)(?:[^&]|&(?!quot;)|"(?:[^&\\\\]|&(?!quot;)|\\\\"|\\\\(?!"))*")*//(?!!)[^!\n]*"); + static QRegExp singleLineCommentLine("(?:^|\n)(?:[^\n&]|&(?!quot;)|"(?:[^&\n\\\\]|&(?!quot;)|\\\\"|\\\\(?!"))*")*//(?!!)[^!\n]*"); static QRegExp singleLineComment("//(?!!)[^!\n]*"); static QRegExp preprocessor("(?:^|\n)(#[ \t]*(?:include|if|elif|endif|error|pragma|define" "|warning)(?:(?:\\\\\n|\\n#)[^\n]*)*)"); |