summaryrefslogtreecommitdiffstats
path: root/src/linguist/lupdate/cpp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/linguist/lupdate/cpp.cpp')
-rw-r--r--src/linguist/lupdate/cpp.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp
index 02a667320..e53994c76 100644
--- a/src/linguist/lupdate/cpp.cpp
+++ b/src/linguist/lupdate/cpp.cpp
@@ -1848,16 +1848,16 @@ void CppParser::parseInternal(ConversionData &cd, const QStringList &includeStac
}
}
- if (yyTok == Tok_Colon) {
- // Skip any token until '{' since we might do things wrong if we find
- // a '::' token here.
+ if (yyTok == Tok_Colon || yyTok == Tok_Other) {
+ // Skip any token until '{' or ';' since we might do things wrong if we find
+ // a '::' or ':' token here.
do {
yyTok = getToken();
if (yyTok == Tok_Eof)
goto goteof;
if (yyTok == Tok_Cancel)
goto case_default;
- } while (yyTok != Tok_LeftBrace);
+ } while (yyTok != Tok_LeftBrace && yyTok != Tok_Semicolon);
} else {
if (yyTok != Tok_LeftBrace) {
// Obviously a forward declaration. We skip those, as they