fix switching of projects within unicode folders

jef-n · jef-n · commit eb95f2f83211 · 2016-08-23T20:46:28.000+02:00
(cherry picked from commit 3951f15)
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -10739,13 +10739,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
`@@ -10739,13 +10739,13 @@ void QgisApp::projectChanged( const QDomDocument &doc )`
`10739`	`10739`	`if ( !prevProjectDir.isNull() )`
`10740`	`10740`	`{`
`10741`	`10741`	`QString prev = prevProjectDir;`
`10742`		`- expr = QString( "sys.path.remove('%1'); " ).arg( prev.replace( '\'', "\\'" ) );`
	`10742`	`+ expr = QString( "sys.path.remove(u'%1'); " ).arg( prev.replace( '\'', "\\'" ) );`
`10743`	`10743`	`}`
`10744`	`10744`
`10745`	`10745`	`prevProjectDir = fi.canonicalPath();`
`10746`	`10746`
`10747`	`10747`	`QString prev = prevProjectDir;`
`10748`		`- expr += QString( "sys.path.append('%1')" ).arg( prev.replace( '\'', "\\'" ) );`
	`10748`	`+ expr += QString( "sys.path.append(u'%1')" ).arg( prev.replace( '\'', "\\'" ) );`
`10749`	`10749`
`10750`	`10750`	`QgsPythonRunner::run( expr );`
`10751`	`10751`	`}`