diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-14 07:07:23 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-14 07:07:23 (GMT) |
| commit | f4f858578afe507ecfebd807f28bad025a85e1b9 (patch) | |
| tree | 1ad38cd654e5a86050e24c7206a0f28f60daf0c1 /tools/linguist/lupdate/cpp.cpp | |
| parent | cf8c14da45187081c50b3b7f2e6e4df4068e8728 (diff) | |
| parent | aa020f60e07eefb81c89a9c94b035b748a4e872c (diff) | |
| download | Qt-f4f858578afe507ecfebd807f28bad025a85e1b9.zip Qt-f4f858578afe507ecfebd807f28bad025a85e1b9.tar.gz Qt-f4f858578afe507ecfebd807f28bad025a85e1b9.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools/linguist/lupdate/cpp.cpp')
| -rw-r--r-- | tools/linguist/lupdate/cpp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp index 857233e..6bd9108 100644 --- a/tools/linguist/lupdate/cpp.cpp +++ b/tools/linguist/lupdate/cpp.cpp @@ -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 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions) plural = true; } } - if (!pendingContext.isEmpty()) { + if (!pendingContext.isEmpty() && !prefix.startsWith(strColons)) { QStringList unresolved; if (!fullyQualify(namespaces, pendingContext, true, &functionContext, &unresolved)) { functionContextUnresolved = unresolved.join(strColons); |