summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJarek Kobus <jkobus@trolltech.com>2009-06-10 11:21:48 (GMT)
committerJarek Kobus <jkobus@trolltech.com>2009-06-10 11:21:48 (GMT)
commitd8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4 (patch)
treea6dc8a1627fc14c777672f8616227c5f6a271d33 /tools
parentf7abcf91ab997dc92518fbc324363e4a936a8c2d (diff)
parent2255027e66a5b3284438de26ab64aaa941489665 (diff)
downloadQt-d8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4.zip
Qt-d8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4.tar.gz
Qt-d8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'tools')
-rw-r--r--tools/linguist/shared/cpp.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/linguist/shared/cpp.cpp b/tools/linguist/shared/cpp.cpp
index 0aab661..541543f 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;
}