fix switching of projects within unicode folders

jef-n · jef-n · commit 3951f15b6481 · 2016-08-23T20:45:47.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -11258,13 +11258,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
`@@ -11258,13 +11258,13 @@ void QgisApp::projectChanged( const QDomDocument &doc )`
`11258`	`11258`	`if ( !prevProjectDir.isNull() )`
`11259`	`11259`	`{`
`11260`	`11260`	`QString prev = prevProjectDir;`
`11261`		`- expr = QString( "sys.path.remove('%1'); " ).arg( prev.replace( '\'', "\\'" ) );`
	`11261`	`+ expr = QString( "sys.path.remove(u'%1'); " ).arg( prev.replace( '\'', "\\'" ) );`
`11262`	`11262`	`}`
`11263`	`11263`
`11264`	`11264`	`prevProjectDir = fi.canonicalPath();`
`11265`	`11265`
`11266`	`11266`	`QString prev = prevProjectDir;`
`11267`		`- expr += QString( "sys.path.append('%1')" ).arg( prev.replace( '\'', "\\'" ) );`
	`11267`	`+ expr += QString( "sys.path.append(u'%1')" ).arg( prev.replace( '\'', "\\'" ) );`
`11268`	`11268`
`11269`	`11269`	`QgsPythonRunner::run( expr );`
`11270`	`11270`	`}`