diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-10 15:48:36 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-10 15:48:36 (GMT) |
| commit | 700a4826cf6bd755df000cb16c259343efb695cd (patch) | |
| tree | 69b19857c352891dd05b35ddf54b997634442379 /tools/linguist/lupdate | |
| parent | 3aee7b78ba1f6c1e4eab9202ddac58e01b3258e7 (diff) | |
| parent | 9385f050620f14e3c3e4616906cf1999bf166041 (diff) | |
| download | Qt-700a4826cf6bd755df000cb16c259343efb695cd.zip Qt-700a4826cf6bd755df000cb16c259343efb695cd.tar.gz Qt-700a4826cf6bd755df000cb16c259343efb695cd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/linguist/lupdate')
| -rw-r--r-- | tools/linguist/lupdate/main.cpp | 3 | ||||
| -rw-r--r-- | tools/linguist/lupdate/qscript.g | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index 1715b79..a575192 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -63,7 +63,7 @@ static void printOut(const QString & out) } class LU { - Q_DECLARE_TR_FUNCTIONS(LUpdate); + Q_DECLARE_TR_FUNCTIONS(LUpdate) }; static void recursiveFileInfoList(const QDir &dir, @@ -651,6 +651,7 @@ int main(int argc, char **argv) } } else { sourceFiles << QDir::cleanPath(fi.absoluteFilePath());; + projectRoots.insert(fi.absolutePath() + QLatin1Char('/')); } } numFiles++; diff --git a/tools/linguist/lupdate/qscript.g b/tools/linguist/lupdate/qscript.g index a07753c..857c58a 100644 --- a/tools/linguist/lupdate/qscript.g +++ b/tools/linguist/lupdate/qscript.g @@ -108,7 +108,7 @@ static void recordMessage( fileName, lineNo, QStringList(), TranslatorMessage::Unfinished, plural); msg.setExtraComment(extracomment.simplified()); - tor->replace(msg); + tor->extend(msg); } |