Fix writing relative file path if project path contains . or .. (pull request #1278)

mhugent · mhugent · commit e880ee4b6574 · 2014-05-15T18:14:47.000+02:00
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1469,8 +1469,10 @@ QString QgsProject::writePath( QString src ) const
     return src;
   }
 
-  QString srcPath = src;
-  QString projPath = fileName();
+  QFileInfo srcFileInfo( src );//QString srcPath = src;
+  QFileInfo projFileInfo( fileName() );
+  QString srcPath = srcFileInfo.canonicalFilePath();
+  QString projPath = projFileInfo.canonicalFilePath();
 
   if ( projPath.isEmpty() )
   {

Original file line number	Diff line number	Diff line change
`@@ -1469,8 +1469,10 @@ QString QgsProject::writePath( QString src ) const`
`1469`	`1469`	`return src;`
`1470`	`1470`	`}`
`1471`	`1471`
`1472`		`- QString srcPath = src;`
`1473`		`- QString projPath = fileName();`
	`1472`	`+ QFileInfo srcFileInfo( src );//QString srcPath = src;`
	`1473`	`+ QFileInfo projFileInfo( fileName() );`
	`1474`	`+ QString srcPath = srcFileInfo.canonicalFilePath();`
	`1475`	`+ QString projPath = projFileInfo.canonicalFilePath();`
`1474`	`1476`
`1475`	`1477`	`if ( projPath.isEmpty() )`
`1476`	`1478`	`{`