diff options
| author | El Mehdi Fekari <mfekari@rim.com> | 2013-07-26 12:29:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-12 18:58:20 +0200 |
| commit | 7571b7a34f27046a2e6d957dc07c4049125c0b2b (patch) | |
| tree | 43c7740700d0349883fbd8f073c408c996760bed /tools | |
| parent | 9c2c12b3ef1a17d54559d229bd788bcf1b731d55 (diff) | |
| download | qt4-tools-7571b7a34f27046a2e6d957dc07c4049125c0b2b.tar.gz | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/lupdate/qdeclarative.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/qdeclarative.cpp b/tools/linguist/lupdate/qdeclarative.cpp index b1c87ea2a8..0d6d71be20 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); |