Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	configure.exe
	src/corelib/kernel/qmetaobject.cpp
	tools/qdoc3/generator.cpp
	tools/qdoc3/test/qt-cpp-ignore.qdocconf
	tools/qdoc3/test/qt-inc.qdocconf

1 files changed, 6 insertions, 5 deletions

diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 1f0112d..85cf430 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -103,7 +103,7 @@ static void printUsage()
         "    -silent\n"
         "           Do not explain what is being done.\n"
         "    -no-sort\n"
-        "           Do not sort contexts in .ts files.\n"
+        "           Do not sort contexts in TS files.\n"
         "    -no-recursive\n"
         "           Do not recursively scan the following directories.\n"
         "    -recursive\n"
@@ -112,10 +112,10 @@ static void printUsage()
         "           Additional location to look for include files.\n"
         "           May be specified multiple times.\n"
         "    -locations {absolute|relative|none}\n"
-        "           Specify/override how source code references are saved in ts files.\n"
+        "           Specify/override how source code references are saved in TS files.\n"
         "           Default is absolute.\n"
         "    -no-ui-lines\n"
-        "           Do not record line numbers in references to .ui files.\n"
+        "           Do not record line numbers in references to UI files.\n"
         "    -disable-heuristic {sametext|similartext|number}\n"
         "           Disable the named merge heuristic. Can be specified multiple times.\n"
         "    -pro <filename>\n"
@@ -182,9 +182,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);