Fix #6764 again. Replace backslash for python code only

qgis · Nov 28, 2012 · 84c709f · 84c709f
1 parent e97afe0
commit 84c709f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -507,11 +507,6 @@ int main( int argc, char *argv[] )
 
   if ( !optionpath.isEmpty() || !configpath.isEmpty() )
   {
-#ifdef Q_WS_WIN
-    //replace backslashes with forward slashes
-    configpath.replace( "\\", "/" );
-    optionpath.replace( "\\", "/" );
-#endif
     // tell QSettings to use INI format and save the file in custom config path
     QSettings::setDefaultFormat( QSettings::IniFormat );
     QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, optionpath.isEmpty() ? configpath : optionpath );
@@ -537,11 +532,6 @@ int main( int argc, char *argv[] )
   QSettings* customizationsettings;
   if ( !optionpath.isEmpty() || !configpath.isEmpty() )
   {
-#ifdef Q_WS_WIN
-    //replace backslashes with forward slashes
-    configpath.replace( "\\", "/" );
-    optionpath.replace( "\\", "/" );
-#endif
     // tell QSettings to use INI format and save the file in custom config path
     QSettings::setDefaultFormat( QSettings::IniFormat );
     QString path = optionpath.isEmpty() ? configpath : optionpath;

diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -457,7 +457,7 @@ QString QgsPythonUtilsImpl::homePythonPath()
   }
   else
   {
-    return '"' + settingsDir + "python\"";
+    return '"' + settingsDir.replace( '\\', "\\\\" ) + "python\"";
   }
 }