From 7571b7a34f27046a2e6d957dc07c4049125c0b2b Mon Sep 17 00:00:00 2001
From: El Mehdi Fekari <mfekari@rim.com>
Date: Fri, 26 Jul 2013 12:29:37 +0200
Subject: 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).

Cherry picked from qttools/441f3d964301942e417b238b6e71

Change-Id: I9cc75854ffb610deccba6c7d3c8ddaf61f6da120
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 tools/linguist/lupdate/qdeclarative.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/linguist/lupdate/qdeclarative.cpp b/tools/linguist/lupdate/qdeclarative.cpp
index b1c87ea..0d6d71b 100644
--- a/tools/linguist/lupdate/qdeclarative.cpp
+++ b/tools/linguist/lupdate/qdeclarative.cpp
@@ -388,7 +388,10 @@ bool loadQml(Translator &translator, const QString &filename, ConversionData &cd
         return false;
     }
 
-    const QString code = QTextStream(&file).readAll();
+    QTextStream ts(&file);
+    ts.setCodec("UTF-8");
+    ts.setAutoDetectUnicode(true);
+    const QString code = ts.readAll();
 
     Engine driver;
     Parser parser(&driver);
-- 
cgit v0.12