sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

ogr provider: don't ignore set encoding if SHAPE_ENCODING is set although OGR

Browse Source 
still claims that strings are already UTF-8
This commit is contained in:
Juergen E. Fischer 2013-04-12 14:22:55 +02:00
parent 95f49beede
commit fea86ea176
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/providers/ogr/qgsogrprovider.cpp
View File

@ -503,7 +503,8 @@ QStringList QgsOgrProvider::subLayers() const
void QgsOgrProvider::setEncoding( const QString& e )
{
#if defined(OLCStringsAsUTF8)
if ( !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )
QSettings settings;
if ( settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() && !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )
{
QgsVectorDataProvider::setEncoding( e );
}