From 2ebebeebd3dacc7192f2f998d324d16bc8cba9fa Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 30 Jul 2009 12:21:22 +0200
Subject: fix infinite loop when meeting improper trId()

---
 tools/linguist/lupdate/cpp.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index 58e094b..21b230e 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -1676,7 +1676,9 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
         case Tok_trid:
             if (!results->tor)
                 goto case_default;
-            if (!sourcetext.isEmpty()) {
+            if (sourcetext.isEmpty()) {
+                yyTok = getToken();
+            } else {
                 if (!msgid.isEmpty())
                     qWarning("%s:%d: //= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring\n",
                              qPrintable(yyFileName), yyLineNo);
-- 
cgit v0.12