Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  fix test under windows
  don't complain about unresolved base when the reference is absolute
  make the lupdate tests more verbose in case of failure
  don't use qmake for test setup
  move equivalent of output_ts test to good/
  look for the .result file in the dir where the output is expected to go
  fix sametext and number heuristics
  fix number heuristics, part 1
  no point in specifying -ts when a .pro file is specified
  clean up the lupdatecmd files
  tidy up the test .pro files
  remove dead code

1 files changed, 0 insertions, 8 deletions

diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 9a9af68..a0ab7f9 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -237,18 +237,12 @@ int main(int argc, char **argv)
         Verbose | // verbose is on by default starting with Qt 4.2
         HeuristicSameText | HeuristicSimilarText | HeuristicNumber;
     int numFiles = 0;
-    bool standardSyntax = true;
     bool metTsFlag = false;
     bool recursiveScan = true;
 
     QString extensions = m_defaultExtensions;
     QSet<QString> extensionsNameFilters;
 
-    for (int  i = 1; i < argc; ++i) {
-        if (args.at(i) == QLatin1String("-ts"))
-            standardSyntax = false;
-    }
-
     for (int i = 1; i < argc; ++i) {
         QString arg = args.at(i);
         if (arg == QLatin1String("-help")
@@ -375,8 +369,6 @@ int main(int argc, char **argv)
 
         numFiles++;
 
-        QString fullText;
-
         codecForTr.clear();
         codecForSource.clear();