Merge pull request #7119 from rldhont/symbol-utils-symbolNameToPath-projectRelativePath

rldhont · web-flow · commit 247836bd6414 · 2018-06-14T10:04:55.000+02:00
[SymbolLayerUtils] Using QgsProject::readPath to resolve relative path in symbolNameToPath
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -3807,9 +3807,8 @@ QString QgsSymbolLayerV2Utils::symbolNameToPath( QString name )
     }
   }
 
-  QFileInfo pfi( QgsProject::instance()->fileName() );
-  QString alternatePath = pfi.canonicalPath() + QDir::separator() + name;
-  if ( pfi.exists() && QFile( alternatePath ).exists() )
+  QString alternatePath = QgsProject::instance()->readPath( name );
+  if ( QFile( alternatePath ).exists() )
   {
     QgsDebugMsg( "Svg found in alternative path" );
     return QFileInfo( alternatePath ).canonicalFilePath();

Original file line number	Diff line number	Diff line change
`@@ -3807,9 +3807,8 @@ QString QgsSymbolLayerV2Utils::symbolNameToPath( QString name )`
`3807`	`3807`	`}`
`3808`	`3808`	`}`
`3809`	`3809`
`3810`		`- QFileInfo pfi( QgsProject::instance()->fileName() );`
`3811`		`- QString alternatePath = pfi.canonicalPath() + QDir::separator() + name;`
`3812`		`- if ( pfi.exists() && QFile( alternatePath ).exists() )`
	`3810`	`+ QString alternatePath = QgsProject::instance()->readPath( name );`
	`3811`	`+ if ( QFile( alternatePath ).exists() )`
`3813`	`3812`	`{`
`3814`	`3813`	`QgsDebugMsg( "Svg found in alternative path" );`
`3815`	`3814`	`return QFileInfo( alternatePath ).canonicalFilePath();`