# HG changeset patch # User Chris Cannam # Date 1427105097 0 # Node ID 2185d52b475892d631c8903075786430226c7620 # Parent 8d2112977aa0d2799ba619c6201c81c01047d01b# Parent 9876a1db566c30398da9c1d751eadbbbee10d495 Merge from default branch diff -r 8d2112977aa0 -r 2185d52b4758 framework/MainWindowBase.cpp --- a/framework/MainWindowBase.cpp Tue Nov 11 16:34:22 2014 +0000 +++ b/framework/MainWindowBase.cpp Mon Mar 23 10:04:57 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();