Merge pull request #43366 from elpaso/bugfix-server-unreported-QGIS_O…

…PTIONS_PATH-broken Server: fix unreported QGIS_OPTIONS_PATH not really working for proj
qgis · May 27, 2021 · d922be7 · d922be7
2 parents 005a0ad + 6f99e26
commit d922be7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -192,7 +192,10 @@ bool QgsServer::init()
   QCoreApplication::setOrganizationDomain( QgsApplication::QGIS_ORGANIZATION_DOMAIN );
   QCoreApplication::setApplicationName( QgsApplication::QGIS_APPLICATION_NAME );
 
-  QgsApplication::init();
+  // TODO: remove QGIS_OPTIONS_PATH from settings and rely on QgsApplication's env var QGIS_CUSTOM_CONFIG_PATH
+  //       Note that QGIS_CUSTOM_CONFIG_PATH gives /tmp/qt_temp-rUpsId/profiles/default/QGIS/QGIS3.ini
+  //       while     QGIS_OPTIONS_PATH gives       /tmp/qt_temp-rUpsId/QGIS/QGIS3.ini
+  QgsApplication::init( qgetenv( "QGIS_OPTIONS_PATH" ) );
 
 #if defined(SERVER_SKIP_ECW)
   QgsMessageLog::logMessage( "Skipping GDAL ECW drivers in server.", "Server", Qgis::Info );