Avoid CRS detection via .qpj when using GDAL3/PROJ6 (fixes #34211)

qgis · Feb 4, 2020 · 5e3ba6c · 5e3ba6c
1 parent 77f07e2
commit 5e3ba6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -3670,6 +3670,7 @@ QgsCoordinateReferenceSystem QgsOgrProvider::crs() const
   if ( !mValid || ( mOGRGeomType == wkbNone ) )
     return srs;
 
+#if PROJ_VERSION_MAJOR<6
   if ( mGDALDriverName == QLatin1String( "ESRI Shapefile" ) )
   {
     int index = mFilePath.indexOf( QLatin1String( ".shp" ), Qt::CaseInsensitive );
@@ -3691,7 +3692,6 @@ QgsCoordinateReferenceSystem QgsOgrProvider::crs() const
   }
 
   // add towgs84 parameter
-#if PROJ_VERSION_MAJOR<6
   Q_NOWARN_DEPRECATED_PUSH
   QgsCoordinateReferenceSystem::setupESRIWktFix();
   Q_NOWARN_DEPRECATED_POP

diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -503,6 +503,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
     CPLSetConfigOption( "SHAPE_ENCODING", nullptr );
   }
 
+#if PROJ_VERSION_MAJOR<6
   if ( srs.isValid() )
   {
     if ( mOgrDriverName == QLatin1String( "ESRI Shapefile" ) )
@@ -521,6 +522,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
       }
     }
   }
+#endif
 
   if ( !mLayer )
   {