diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 14:36:53 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 14:36:53 +0100 |
| commit | 7b15c669c336a1d76e3ac001fadde38a294e3e80 (patch) | |
| tree | 2b8e9631019d1bc9af37d9a93bb93ce0eb16381a /tools/linguist/lrelease/main.cpp | |
| parent | 47bc34f413d9a0c6efac6ca3eead95eed7da2e40 (diff) | |
| parent | 86048e1a09fce11f557d0e8b117229a754ee9098 (diff) | |
Merge branch 'tools-team/4.6' (early part) into 4.6
Conflicts:
src/corelib/tools/qscopedpointer.h
Diffstat (limited to 'tools/linguist/lrelease/main.cpp')
| -rw-r--r-- | tools/linguist/lrelease/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp index ecaed275d6..742c2e6f07 100644 --- a/tools/linguist/lrelease/main.cpp +++ b/tools/linguist/lrelease/main.cpp @@ -105,7 +105,7 @@ static bool loadTsFile(Translator &tor, const QString &tsFileName, bool /* verbo static bool releaseTranslator(Translator &tor, const QString &qmFileName, ConversionData &cd, bool removeIdentical) { - Translator::reportDuplicates(tor.resolveDuplicates(), qmFileName, cd.isVerbose()); + tor.reportDuplicates(tor.resolveDuplicates(), qmFileName, cd.isVerbose()); if (cd.isVerbose()) printOut(QCoreApplication::tr( "Updating '%1'...\n").arg(qmFileName)); |