diff options
| author | Andreas Kling <andreas.kling@nokia.com> | 2010-01-20 08:34:08 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-01-20 08:34:08 (GMT) |
| commit | 01f733a64e45363e74bea62e4cae8a658bc09383 (patch) | |
| tree | ea39b38552a063e7e10bd432b1155a7abae61620 /tools/linguist/lupdate/cpp.cpp | |
| parent | fdf463ba74b2e00ba5f9db10f43585e8b15054f7 (diff) | |
| parent | b906feddf1593a837785bc41d65e837e64d31284 (diff) | |
| download | Qt-01f733a64e45363e74bea62e4cae8a658bc09383.zip Qt-01f733a64e45363e74bea62e4cae8a658bc09383.tar.gz Qt-01f733a64e45363e74bea62e4cae8a658bc09383.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'tools/linguist/lupdate/cpp.cpp')
| -rw-r--r-- | tools/linguist/lupdate/cpp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp index 12c06b1..6bd9108 100644 --- a/tools/linguist/lupdate/cpp.cpp +++ b/tools/linguist/lupdate/cpp.cpp @@ -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); |