fix switching of projects within unicode folders

jef-n · jef-n · commit f156b1f64d4f · 2016-08-23T20:46:39.000+02:00
(cherry picked from commit 3951f15)
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -11216,13 +11216,13 @@ void QgisApp::projectChanged( const QDomDocument &doc )
   if ( !prevProjectDir.isNull() )
   {
     QString prev = prevProjectDir;
-    expr = QString( "sys.path.remove('%1'); " ).arg( prev.replace( '\'', "\\'" ) );
+    expr = QString( "sys.path.remove(u'%1'); " ).arg( prev.replace( '\'', "\\'" ) );
   }
 
   prevProjectDir = fi.canonicalPath();
 
   QString prev = prevProjectDir;
-  expr += QString( "sys.path.append('%1')" ).arg( prev.replace( '\'', "\\'" ) );
+  expr += QString( "sys.path.append(u'%1')" ).arg( prev.replace( '\'', "\\'" ) );
 
   QgsPythonRunner::run( expr );
 }

Original file line number	Diff line number	Diff line change
`@@ -11216,13 +11216,13 @@ void QgisApp::projectChanged( const QDomDocument &doc )`
`11216`	`11216`	`if ( !prevProjectDir.isNull() )`
`11217`	`11217`	`{`
`11218`	`11218`	`QString prev = prevProjectDir;`
`11219`		`- expr = QString( "sys.path.remove('%1'); " ).arg( prev.replace( '\'', "\\'" ) );`
	`11219`	`+ expr = QString( "sys.path.remove(u'%1'); " ).arg( prev.replace( '\'', "\\'" ) );`
`11220`	`11220`	`}`
`11221`	`11221`
`11222`	`11222`	`prevProjectDir = fi.canonicalPath();`
`11223`	`11223`
`11224`	`11224`	`QString prev = prevProjectDir;`
`11225`		`- expr += QString( "sys.path.append('%1')" ).arg( prev.replace( '\'', "\\'" ) );`
	`11225`	`+ expr += QString( "sys.path.append(u'%1')" ).arg( prev.replace( '\'', "\\'" ) );`
`11226`	`11226`
`11227`	`11227`	`QgsPythonRunner::run( expr );`
`11228`	`11228`	`}`