diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-08 10:09:08 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-08 10:21:54 (GMT) |
| commit | ed4c85c33683ce541590639f19adcef8dcd001a8 (patch) | |
| tree | 4f4e782eb85dcb275b7346ff87cc02d7df7d4cb3 | |
| parent | 9e2b47da3b88c63acb1b3a8cb7566f2a1e0e18ff (diff) | |
| download | Qt-ed4c85c33683ce541590639f19adcef8dcd001a8.zip Qt-ed4c85c33683ce541590639f19adcef8dcd001a8.tar.gz Qt-ed4c85c33683ce541590639f19adcef8dcd001a8.tar.bz2 | |
don't drop all location tags after the first file without any
Task-number: 256647
| -rw-r--r-- | tools/linguist/lupdate/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index c28bf8b..52a57fb 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -178,9 +178,10 @@ static void updateTsFiles(const Translator &fetchedTor, const QStringList &tsFil if (options & Verbose) printOut(QObject::tr("Updating '%1'...\n").arg(fn)); + UpdateOptions theseOptions = options; if (tor.locationsType() == Translator::NoLocations) // Could be set from file - options |= NoLocations; - Translator out = merge(tor, fetchedTor, options, err); + theseOptions |= NoLocations; + Translator out = merge(tor, fetchedTor, theseOptions, err); if (!codecForTr.isEmpty()) out.setCodecName(codecForTr); |