diff -r 41300fa6a67c -r 3b1da2848fc7 tools/linguist/lupdate/cpp.cpp --- a/tools/linguist/lupdate/cpp.cpp Tue Feb 02 00:43:10 2010 +0200 +++ b/tools/linguist/lupdate/cpp.cpp Fri Feb 19 23:40:16 2010 +0200 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -1732,7 +1732,7 @@ plural = true; } } - if (!pendingContext.isEmpty()) { + if (!pendingContext.isEmpty() && !prefix.startsWith(strColons)) { QStringList unresolved; if (!fullyQualify(namespaces, pendingContext, true, &functionContext, &unresolved)) { functionContextUnresolved = unresolved.join(strColons);