# HG changeset patch # User Chris Cannam # Date 1425375239 0 # Node ID 720f732e8082eec24508cc87df604de4d7950d95 # Parent 7a671befc76df9b87b00c9eea4bb603c773966ec# Parent 9876a1db566c30398da9c1d751eadbbbee10d495 Merge from default branch diff -r 7a671befc76d -r 720f732e8082 framework/MainWindowBase.cpp --- a/framework/MainWindowBase.cpp Mon Nov 17 15:31:07 2014 +0000 +++ b/framework/MainWindowBase.cpp Tue Mar 03 09:33:59 2015 +0000 @@ -90,6 +90,7 @@ #include #include #include +#include #include #include #include @@ -2235,6 +2236,7 @@ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); QTextStream out(&bzFile); + out.setCodec(QTextCodec::codecForName("UTF-8")); toXml(out, false); out.flush(); @@ -2280,6 +2282,7 @@ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); QTextStream out(&file); + out.setCodec(QTextCodec::codecForName("UTF-8")); toXml(out, true); out.flush();