Skip to content
Permalink
Browse files

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

… as utf-8
  • Loading branch information
jef-n committed Feb 17, 2015
1 parent e748281 commit b087853148764611b6de3911be503a7adbb1d02c
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/app/qgsidentifyresultsdialog.cpp
  2. +1 −1 src/core/qgsgml.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
@@ -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;
}

0 comments on commit b087853

Please sign in to comment.
You can’t perform that action at this time.