[composer] Correctly handle encoded HTML source (fix #11287)

qgis · Sep 30, 2014 · 1841225 · 1841225
1 parent 595de48
commit 1841225
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/core/qgsnetworkcontentfetcher.cpp b/src/core/qgsnetworkcontentfetcher.cpp
@@ -21,6 +21,7 @@
 #include "qgsmessagelog.h"
 #include "qgsapplication.h"
 #include <QNetworkReply>
+#include <QTextCodec>
 
 QgsNetworkContentFetcher::QgsNetworkContentFetcher()
     : mReply( 0 )
@@ -64,7 +65,10 @@ QString QgsNetworkContentFetcher::contentAsString() const
   }
 
   QByteArray array = mReply->readAll();
-  return QString( array );
+
+  //correctly encode reply as unicode
+  QString content = QTextCodec::codecForHtml( array )->toUnicode( array );
+  return content;
 }
 
 void QgsNetworkContentFetcher::contentLoaded( bool ok )