For Mac OS X, if the GDAL plugins are bundled with the application, s…

…et an environment variable to search the bundle before searching the GDAL prefix path hardcoded into the library.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5580 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/gui/main.cpp

@@ -369,6 +369,14 @@ int main(int argc, char *argv[])
   {
     QCoreApplication::setLibraryPaths(QStringList(QCoreApplication::applicationDirPath()));
   }
+
+  // If the GDAL plugins are bundled with the application and GDAL_DRIVER_PATH
+  // is not already defined, use the GDAL plugins in the application bundle.
+  QString gdalPlugins(QCoreApplication::applicationDirPath().append("/lib/gdalplugins"));
+  if (QFile::exists(gdalPlugins) && !getenv("GDAL_DRIVER_PATH"))
+  {
+    setenv("GDAL_DRIVER_PATH", gdalPlugins, 1);
+  }
 #endif
 
   // Check to see if qgis was started from the source directory.