Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

1 files changed, 3 insertions, 1 deletions

diff --git a/tools/linguist/shared/cpp.cpp b/tools/linguist/shared/cpp.cpp
index 0aab661208..541543fa13 100644
--- a/tools/linguist/shared/cpp.cpp
+++ b/tools/linguist/shared/cpp.cpp
@@ -480,7 +480,9 @@ static bool matchString(QString *s)
     s->clear();
     while (yyTok == Tok_String) {
         *s += yyString;
-        yyTok = getToken();
+        do {
+            yyTok = getToken();
+        } while (yyTok == Tok_Comment);
     }
     return matches;
 }