identify results: consider plain/text wms response and gml attributes…

… as utf-8
qgis · Feb 17, 2015 · b087853 · b087853
1 parent e748281
commit b087853
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -741,11 +741,11 @@ void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
     featItem->addChild( attrItem ); // before setHtml()!
     if ( !attributes.isEmpty() )
     {
-      attrItem->setContent( attributes.begin().value().toUtf8(), currentFormat == QgsRaster::IdentifyFormatHtml ? "text/html" : "text/plain" );
+      attrItem->setContent( attributes.begin().value().toUtf8(), currentFormat == QgsRaster::IdentifyFormatHtml ? "text/html" : "text/plain; charset=utf-8" );
     }
     else
     {
-      attrItem->setContent( tr( "No attributes." ).toUtf8(), "text/plain" );
+      attrItem->setContent( tr( "No attributes." ).toUtf8(), "text/plain; charset=utf-8" );
     }
   }
   else

diff --git a/src/core/qgsgml.cpp b/src/core/qgsgml.cpp
@@ -614,7 +614,7 @@ QString QgsGml::readAttribute( const QString& attributeName, const XML_Char** at
   {
     if ( attributeName.compare( attr[i] ) == 0 )
     {
-      return QString( attr[i+1] );
+      return QString::fromUtf8( attr[i+1] );
     }
     i += 2;
   }