add default UTF-8 encoding to grass provider by default

qgis · Oct 19, 2020 · fb11887 · fb11887
1 parent 390384c
commit fb11887
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/providers/grass/qgsgrassfeatureiterator.cpp b/src/providers/grass/qgsgrassfeatureiterator.cpp
@@ -743,7 +743,7 @@ QgsGrassFeatureSource::QgsGrassFeatureSource( const QgsGrassProvider *p )
   , mGrassType( p->mGrassType )
   , mQgisType( p->mQgisType )
   , mFields( p->fields() )
-  , mEncoding( p->textEncoding() )
+  , mEncoding( p->textEncoding() ) // no copying - this is a borrowed pointer from Qt
   , mEditing( p->mEditBuffer )
 {
   Q_ASSERT( mLayer );

diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -250,6 +250,10 @@ QgsGrassProvider::QgsGrassProvider( const QString &uri )
                   // << QgsVectorDataProvider::NativeType( tr( "Date" ), "date", QVariant::Date, 8, 8 );
                 );
 
+  // Assign default encoding
+  if ( !textEncoding() )
+    QgsVectorDataProvider::setEncoding( QStringLiteral( "UTF-8" ) );
+
   mValid = true;
 
   QgsDebugMsg( QString( "New GRASS layer opened, time (ms): %1" ).arg( time.elapsed() ) );