Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 20 insertions, 12 deletions

diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 86b7866..5cb9e1a 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "translator.h"
-#include "profileevaluator.h"
+#include "proreader.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
@@ -66,19 +66,21 @@ static void printUsage()
         "    lrelease [options] project-file\n"
         "    lrelease [options] ts-files [-qm qm-file]\n\n"
         "lrelease is part of Qt's Linguist tool chain. It can be used as a\n"
-        "stand-alone tool to convert XML based translations files in the .ts\n"
-        "format into the 'compiled' .qm format used by QTranslator objects.\n\n"
+        "stand-alone tool to convert XML-based translations files in the TS\n"
+        "format into the 'compiled' QM format used by QTranslator objects.\n\n"
         "Options:\n"
         "    -help  Display this information and exit\n"
+        "    -idbased\n"
+        "           Use IDs instead of source strings for message keying\n"
         "    -compress\n"
-        "           Compress the .qm files\n"
+        "           Compress the QM files\n"
         "    -nounfinished\n"
         "           Do not include unfinished translations\n"
         "    -removeidentical\n"
         "           If the translated text is the same as\n"
         "           the source text, do not include the message\n"
         "    -silent\n"
-        "           Don't explain what is being done\n"
+        "           Do not explain what is being done\n"
         "    -version\n"
         "           Display the version of lrelease and exit\n"
     ));
@@ -99,7 +101,7 @@ static bool loadTsFile(Translator &tor, const QString &tsFileName, bool /* verbo
 
 static bool releaseTranslator(Translator &tor, const QString &qmFileName,
     bool verbose, bool ignoreUnfinished,
-    bool removeIdentical, TranslatorSaveMode mode)
+    bool removeIdentical, bool idBased, TranslatorSaveMode mode)
 {
     Translator::reportDuplicates(tor.resolveDuplicates(), qmFileName, verbose);
 
@@ -119,8 +121,10 @@ static bool releaseTranslator(Translator &tor, const QString &qmFileName,
     }
 
     ConversionData cd;
+    tor.normalizeTranslations(cd);
     cd.m_verbose = verbose;
     cd.m_ignoreUnfinished = ignoreUnfinished;
+    cd.m_idBased = idBased;
     cd.m_saveMode = mode;
     bool ok = tor.release(&file, cd);
     file.close();
@@ -136,7 +140,7 @@ static bool releaseTranslator(Translator &tor, const QString &qmFileName,
 }
 
 static bool releaseTsFile(const QString& tsFileName, bool verbose,
-    bool ignoreUnfinished, bool removeIdentical, TranslatorSaveMode mode)
+    bool ignoreUnfinished, bool removeIdentical, bool idBased, TranslatorSaveMode mode)
 {
     Translator tor;
     if (!loadTsFile(tor, tsFileName, verbose))
@@ -151,7 +155,7 @@ static bool releaseTsFile(const QString& tsFileName, bool verbose,
     }
     qmFileName += QLatin1String(".qm");
 
-    return releaseTranslator(tor, qmFileName, verbose, ignoreUnfinished, removeIdentical, mode);
+    return releaseTranslator(tor, qmFileName, verbose, ignoreUnfinished, removeIdentical, idBased, mode);
 }
 
 int main(int argc, char **argv)
@@ -164,6 +168,7 @@ int main(int argc, char **argv)
 
     bool verbose = true; // the default is true starting with Qt 4.2
     bool ignoreUnfinished = false;
+    bool idBased = false;
     // the default mode is SaveEverything starting with Qt 4.2
     TranslatorSaveMode mode = SaveEverything;
     bool removeIdentical = false;
@@ -175,6 +180,9 @@ int main(int argc, char **argv)
         if (args[i] == QLatin1String("-compress")) {
             mode = SaveStripped;
             continue;
+        } else if (args[i] == QLatin1String("-idbased")) {
+            idBased = true;
+            continue;
         } else if (args[i] == QLatin1String("-nocompress")) {
             mode = SaveEverything;
             continue;
@@ -232,18 +240,18 @@ int main(int argc, char **argv)
                              qPrintable(args[i]));
                 } else {
                     foreach (const QString &trans, translations)
-                        if (!releaseTsFile(trans, verbose, ignoreUnfinished, removeIdentical, mode))
+                        if (!releaseTsFile(trans, verbose, ignoreUnfinished, removeIdentical, idBased, mode))
                             return 1;
                 }
             } else {
                 qWarning("error: lrelease encountered project file functionality that is currently not supported.\n"
-                    "You might want to consider using .ts files as input instead of a project file.\n"
+                    "You might want to consider using TS files as input instead of a project file.\n"
                     "Try the following syntax:\n"
                     "    lrelease [options] ts-files [-qm qm-file]\n");
             }
         } else {
             if (outputFile.isEmpty()) {
-                if (!releaseTsFile(args[i], verbose, ignoreUnfinished, removeIdentical, mode))
+                if (!releaseTsFile(args[i], verbose, ignoreUnfinished, removeIdentical, idBased, mode))
                     return 1;
             } else {
                 if (!loadTsFile(tor, args[i], verbose))
@@ -254,7 +262,7 @@ int main(int argc, char **argv)
 
     if (!outputFile.isEmpty())
         return releaseTranslator(tor, outputFile, verbose, ignoreUnfinished,
-                                 removeIdentical, mode) ? 0 : 1;
+                                 removeIdentical, idBased, mode) ? 0 : 1;
 
     return 0;
 }