From 5cfa6627b47cacc92fc4b6d46539f8cbab5061f6 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Tue, 17 Dec 2019 11:19:48 +1000
Subject: [PATCH] Don't incorrectly flag unknown CRS created from proj strings
 as invalid on proj 6+ builds

---
 src/core/qgscoordinatereferencesystem.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
index ea008e57085..93d3e7a0656 100644
--- a/src/core/qgscoordinatereferencesystem.cpp
+++ b/src/core/qgscoordinatereferencesystem.cpp
@@ -1011,6 +1011,7 @@ bool QgsCoordinateReferenceSystem::createFromProj( const QString &projString )
   {
     // Last ditch attempt to piece together what we know of the projection to find a match...
     setProjString( myProj4String );
+#if PROJ_VERSION_MAJOR<6
     Q_NOWARN_DEPRECATED_PUSH
     mySrsId = findMatchingProj();
     Q_NOWARN_DEPRECATED_POP
@@ -1022,6 +1023,7 @@ bool QgsCoordinateReferenceSystem::createFromProj( const QString &projString )
     {
       d->mIsValid = false;
     }
+#endif
   }
 #endif