diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-15 15:22:14 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-15 18:17:22 (GMT) |
| commit | 445ef827e857a075ab13c7b1ce5769f95f972299 (patch) | |
| tree | 4737d9e1af870c8b994ebec3e6698b24e17714a5 /tools | |
| parent | 2b529b77bc8caf0f4e56ea6dd1af4f0423fd74d6 (diff) | |
| download | Qt-445ef827e857a075ab13c7b1ce5769f95f972299.zip Qt-445ef827e857a075ab13c7b1ce5769f95f972299.tar.gz Qt-445ef827e857a075ab13c7b1ce5769f95f972299.tar.bz2 | |
don't let comments weaved into strings confuse us
Task-number: 254260
cherry-picked 941a03814a5f8f7be93425f71ee65a4222d16899 after botched
merge from 4.5
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/lupdate/cpp.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp index b9e8406..7f52c53 100644 --- a/tools/linguist/lupdate/cpp.cpp +++ b/tools/linguist/lupdate/cpp.cpp @@ -1153,7 +1153,9 @@ bool CppParser::matchString(QString *s) s->clear(); while (yyTok == Tok_String) { *s += yyString; - yyTok = getToken(); + do { + yyTok = getToken(); + } while (yyTok == Tok_Comment); } return matches; } |