diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-31 02:08:46 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-31 02:08:46 (GMT) |
| commit | c0baaf9b1ba5ba5089e230253c2b711cb7d43735 (patch) | |
| tree | 4a0d6968fc5137ad31f37620c2eb9de087bf0843 /tools/linguist/lupdate | |
| parent | af8689cb4f2975ec7f8658a709195d9be4aff33f (diff) | |
| parent | 1835decbcfe6c95de3c895cb5bf2d0cefe4d2643 (diff) | |
| download | Qt-c0baaf9b1ba5ba5089e230253c2b711cb7d43735.zip Qt-c0baaf9b1ba5ba5089e230253c2b711cb7d43735.tar.gz Qt-c0baaf9b1ba5ba5089e230253c2b711cb7d43735.tar.bz2 | |
Merge branch 'master' of ../../qt into kinetic-declarativeui
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qabstractitemmodel.cpp
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qmetaobject.h
Diffstat (limited to 'tools/linguist/lupdate')
| -rw-r--r-- | tools/linguist/lupdate/cpp.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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); |