lupdate: Fixing decoding of QML files

Decode text stream from QML files as UTF-8 even when the latter
is not the default system encoding (QML supports UTF-8 only).

Change-Id: I32ccf88e93182ffa78345235217258761e95195a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/src/linguist/lupdate/qdeclarative.cpp b/src/linguist/lupdate/qdeclarative.cpp
index befeea2..41ef698 100644 (file)
--- a/src/linguist/lupdate/qdeclarative.cpp
+++ b/src/linguist/lupdate/qdeclarative.cpp
@@ -460,7 +460,15 @@ static bool load(Translator &translator, const QString &filename, ConversionData
         return false;
     }
 
-    QString code = QTextStream(&file).readAll();
+    QString code;
+    if (!qmlMode) {
+        code = QTextStream(&file).readAll();
+    } else {
+        QTextStream ts(&file);
+        ts.setCodec("UTF-8");
+        ts.setAutoDetectUnicode(true);
+        code = ts.readAll();
+    }
 
     if (! qmlMode) {
         // fetch the optional pragma directives for Javascript files.