Merge pull request #9935 from mbernasocchi/fix_profiles_profiles

mbernasocchi · web-flow · commit e213bde9c11b · 2019-05-06T17:39:53.000+02:00
remove redundant /profiles when QGIS_CUSTOM_CONFIG_PATH is set
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -176,8 +176,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
`@@ -176,8 +176,7 @@ void QgsApplication::init( QString profileFolder )`
`176`	`176`	`{`
`177`	`177`	`if ( getenv( "QGIS_CUSTOM_CONFIG_PATH" ) )`
`178`	`178`	`{`
`179`		`- QString envProfileFolder = getenv( "QGIS_CUSTOM_CONFIG_PATH" );`
`180`		`- profileFolder = envProfileFolder + QDir::separator() + "profiles";`
	`179`	`+ profileFolder = getenv( "QGIS_CUSTOM_CONFIG_PATH" );`
`181`	`180`	`}`
`182`	`181`	`else`
`183`	`182`	`{`