diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-17 00:29:52 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-17 00:29:52 (GMT) |
| commit | b4754aa9a3761c1bcd8519280d98e34371f4ff10 (patch) | |
| tree | 5c664db9fb7e2a64866c68a93ef764edcda06b51 /tools | |
| parent | 2c8fd4485a707000be2cb001fd8cd7f0398ff9a1 (diff) | |
| parent | 9042c290f3dd711a5e351892e050dc71f682446f (diff) | |
| download | Qt-b4754aa9a3761c1bcd8519280d98e34371f4ff10.zip Qt-b4754aa9a3761c1bcd8519280d98e34371f4ff10.tar.gz Qt-b4754aa9a3761c1bcd8519280d98e34371f4ff10.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
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 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]*)*)"); |