handle windows line endings in the qtdeclarative/js processor

apparently the parser does not do that any more, so do it here.

Change-Id: Idd7259ba1435f14be2be5afafa40689a05ab62af
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/src/linguist/lupdate/qdeclarative.cpp b/src/linguist/lupdate/qdeclarative.cpp
index 275dd04..7ab81d5 100644 (file)
--- a/src/linguist/lupdate/qdeclarative.cpp
+++ b/src/linguist/lupdate/qdeclarative.cpp
@@ -383,7 +383,7 @@ void FindTrCalls::processComment(const AST::SourceLocation &loc)
                     if (p >= length)
                         goto whoops;
                     c = chars[p++].unicode();
-                    if (c == '\n')
+                    if (c == '\r' || c == '\n')
                         goto whoops;
                     *ptr++ = '\\';
                 }
@@ -394,7 +394,7 @@ void FindTrCalls::processComment(const AST::SourceLocation &loc)
     } else {
         int idx = 0;
         ushort c;
-        while ((c = chars[idx].unicode()) == ' ' || c == '\t' || c == '\n')
+        while ((c = chars[idx].unicode()) == ' ' || c == '\t' || c == '\r' || c == '\n')
             ++idx;
         if (!memcmp(chars + idx, MagicComment.unicode(), MagicComment.length() * 2)) {
             idx += MagicComment.length();