diff options
author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-10-07 13:30:41 +0300 |
---|---|---|
committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-10-07 13:38:10 +0300 |
commit | d0cfd79d940bd9ed4dd63334ecf686fa013eaf37 (patch) | |
tree | db1b788f7d599b5ae3e61a2e08a71eb37fef6a98 | |
parent | da8d2d55ccc3edd28ef3e77de46dae255282a46b (diff) |
Fix materialdef special charactersv2.5.0-beta3
The materialdef xml file was not being read with a proper encoding.
Task-number: QT3DS-3975
Change-Id: Iadc5ef1565b716a0d4a7330d5920648811c57ac6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
-rw-r--r-- | src/runtime/q3dsmaterialdefinitionparser.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/runtime/q3dsmaterialdefinitionparser.cpp b/src/runtime/q3dsmaterialdefinitionparser.cpp index 913a24e..1cdbc48 100644 --- a/src/runtime/q3dsmaterialdefinitionparser.cpp +++ b/src/runtime/q3dsmaterialdefinitionparser.cpp @@ -52,6 +52,7 @@ void Q3DSMaterialDefinitionParser::getMaterialInfo(const QString &materialDefini return; } QTextStream stream(&file); + stream.setCodec("UTF-8"); matDef = stream.readAll(); } else { matDef = materialDefinition; |