From 85938ae1fea694bcc098403c7ea82ee50cbf2746 Mon Sep 17 00:00:00 2001
From: Peter Petrik <zilolv@gmail.com>
Date: Wed, 23 Sep 2020 11:15:43 +0200
Subject: [PATCH] another try to fix #38919

---
 src/app/main.cpp            | 10 ----------
 src/core/qgsapplication.cpp | 12 ++++++++++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 17869cf5af2..a134c9d5c2b 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1227,16 +1227,6 @@ int main( int argc, char *argv[] )
     }
   }
 
-  // Point PROJ_LIB at any PROJ_LIB share directory embedded in the app bundle
-  if ( !getenv( "PROJ_LIB" ) )
-  {
-    QString projLib( QDir::cleanPath( QgsApplication::pkgDataPath().append( "/proj" ) ) );
-    if ( QFile::exists( projLib ) )
-    {
-      setenv( "PROJ_LIB", projLib.toUtf8().constData(), 1 );
-    }
-  }
-
   // Point PYTHONHOME to embedded interpreter if present in the bundle
   if ( !getenv( "PYTHONHOME" ) )
   {
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
index 5e6554b2dc8..33a2ed7624d 100644
--- a/src/core/qgsapplication.cpp
+++ b/src/core/qgsapplication.cpp
@@ -335,6 +335,15 @@ void QgsApplication::init( QString profileFolder )
   // append local user-writable folder as a proj search path
   QStringList currentProjSearchPaths = QgsProjUtils::searchPaths();
   currentProjSearchPaths.append( qgisSettingsDirPath() + QStringLiteral( "proj" ) );
+#ifdef Q_OS_MACX
+  // append bundled proj lib for MacOS
+  QString projLib( QDir::cleanPath( pkgDataPath().append( "/proj" ) ) );
+  if ( QFile::exists( projLib ) )
+  {
+    currentProjSearchPaths.append(projLib);
+  }
+#endif // Q_OS_MACX
+
   char **newPaths = new char *[currentProjSearchPaths.length()];
   for ( int i = 0; i < currentProjSearchPaths.count(); ++i )
   {
@@ -346,8 +355,7 @@ void QgsApplication::init( QString profileFolder )
     CPLFree( newPaths[i] );
   }
   delete [] newPaths;
-#endif
-
+#endif // PROJ_VERSION_MAJOR>=6
 
   // allow Qt to search for Qt plugins (e.g. sqldrivers) in our plugin directory
   QCoreApplication::addLibraryPath( pluginPath() );