Merge pull request #9936 from qgis/backport-9935-to-release-3_4

elpaso · web-flow · commit 38b10fea180a · 2019-05-08T17:07:42.000+02:00
[Backport release-3_4] remove redundant /profiles when QGIS_CUSTOM_CONFIG_PATH is set
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -172,8 +172,7 @@ void QgsApplication::init( QString profileFolder )
   {
     if ( getenv( "QGIS_CUSTOM_CONFIG_PATH" ) )
     {
-      QString envProfileFolder = getenv( "QGIS_CUSTOM_CONFIG_PATH" );
-      profileFolder = envProfileFolder + QDir::separator() + "profiles";
+      profileFolder = getenv( "QGIS_CUSTOM_CONFIG_PATH" );
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,7 @@ void QgsApplication::init( QString profileFolder )`
`172`	`172`	`{`
`173`	`173`	`if ( getenv( "QGIS_CUSTOM_CONFIG_PATH" ) )`
`174`	`174`	`{`
`175`		`- QString envProfileFolder = getenv( "QGIS_CUSTOM_CONFIG_PATH" );`
`176`		`- profileFolder = envProfileFolder + QDir::separator() + "profiles";`
	`175`	`+ profileFolder = getenv( "QGIS_CUSTOM_CONFIG_PATH" );`
`177`	`176`	`}`
`178`	`177`	`else`
`179`	`178`	`{`