summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qdoc/tokenizer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/qdoc/tokenizer.cpp b/src/tools/qdoc/tokenizer.cpp
index 82effb9bae..f95af6ee82 100644
--- a/src/tools/qdoc/tokenizer.cpp
+++ b/src/tools/qdoc/tokenizer.cpp
@@ -599,8 +599,11 @@ int Tokenizer::getTokenAfterPreprocessor()
}
if (!directive.isEmpty()) {
while (yyCh != EOF && yyCh != '\n') {
- if (yyCh == '\\')
+ if (yyCh == '\\') {
yyCh = getChar();
+ if (yyCh == '\r')
+ yyCh = getChar();
+ }
condition += yyCh;
yyCh = getChar();
}