Use windows path format for project_path/project_folder variables on …

…windows (cherry-picked from 2745797)
qgis · Jul 11, 2017 · ff5181c2e90c1b1124e5927fc52e6cfda3e07acf · ff5181c
1 parent e6dc103
commit ff5181c2e90c1b1124e5927fc52e6cfda3e07acf
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 src/core/qgsexpressioncontext.cpp
diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
@@ -631,8 +631,8 @@ QgsExpressionContextScope* QgsExpressionContextUtils::projectScope()
 
   //add other known project variables
   scope->addVariable( QgsExpressionContextScope::StaticVariable( "project_title", project->title(), true ) );
-  scope->addVariable( QgsExpressionContextScope::StaticVariable( "project_path", project->fileInfo().filePath(), true ) );
-  scope->addVariable( QgsExpressionContextScope::StaticVariable( "project_folder", project->fileInfo().dir().path(), true ) );
+  scope->addVariable( QgsExpressionContextScope::StaticVariable( "project_path", QDir::toNativeSeparators( project->fileInfo().filePath() ), true ) );
+  scope->addVariable( QgsExpressionContextScope::StaticVariable( "project_folder", QDir::toNativeSeparators( project->fileInfo().dir().path() ), true ) );
   scope->addVariable( QgsExpressionContextScope::StaticVariable( "project_filename", project->fileInfo().fileName(), true ) );
 
   scope->addFunction( "project_color", new GetNamedProjectColor() );