Merge commit 'origin/4.5'

Conflicts:
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebCore/ChangeLog
	src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
	src/3rdparty/webkit/WebCore/page/DOMWindow.idl
	src/corelib/io/qdiriterator.cpp
	src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
	src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
	tests/auto/qxmlquery/tst_qxmlquery.cpp
	tools/linguist/lconvert/main.cpp

1 files changed, 14 insertions, 3 deletions

diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp
index 4bed02f..1381595 100644
--- a/tools/linguist/lconvert/main.cpp
+++ b/tools/linguist/lconvert/main.cpp
@@ -81,8 +81,11 @@ static int usage(const QStringList &args)
         "    --output-format <outformat>\n"
         "           Specify output format. See -if.\n\n"
         "    --input-codec <codec>\n"
-        "           Specify encoding for QM input files. Default is 'Latin1'.\n"
-        "           UTF-8 is always tried as well, corresponding to the trUtf8() function.\n\n"
+        "           Specify encoding for QM and PO input files. Default is 'Latin1'\n"
+        "           for QM and 'UTF-8' for PO files. UTF-8 is always tried as well for\n"
+        "           QM, corresponding to the possible use of the trUtf8() function.\n\n"
+        "    --output-codec <codec>\n"
+        "           Specify encoding for PO output files. Default is 'UTF-8'.\n\n"
         "    --drop-tags <regexp>\n"
         "           Drop named extra tags when writing TS or XLIFF files.\n"
         "           May be specified repeatedly.\n\n"
@@ -141,7 +144,6 @@ int main(int argc, char *argv[])
     Translator::LocationsType locations = Translator::DefaultLocations;
 
     ConversionData cd;
-    cd.m_codecForSource = "Latin1";
     Translator tr;
 
     for (int i = 1; i < args.size(); ++i) {
@@ -174,6 +176,10 @@ int main(int argc, char *argv[])
             if (++i >= args.size())
                 return usage(args);
             cd.m_codecForSource = args[i].toLatin1();
+        } else if (args[i] == QLatin1String("-output-codec")) {
+            if (++i >= args.size())
+                return usage(args);
+            cd.m_outputCodec = args[i].toLatin1();
         } else if (args[i] == QLatin1String("-drop-tag")) {
             if (++i >= args.size())
                 return usage(args);
@@ -257,6 +263,11 @@ int main(int argc, char *argv[])
     if (locations != Translator::DefaultLocations)
         tr.setLocationsType(locations);
 
+    tr.normalizeTranslations(cd);
+    if (!cd.errors().isEmpty()) {
+        qWarning("%s", qPrintable(cd.error()));
+        cd.clearErrors();
+    }
     if (!tr.save(outFileName, cd, outFormat)) {
         qWarning("%s", qPrintable(cd.error()));
         return 3;