Skip to content
Permalink
Browse files
Fix #6764 again. Replace backslash for python code only
  • Loading branch information
NathanW2 committed Nov 28, 2012
1 parent e97afe0 commit 84c709f1a62667f3aa20963a8b2c1d566fdcee47
Showing with 1 addition and 11 deletions.
  1. +0 −10 src/app/main.cpp
  2. +1 −1 src/python/qgspythonutilsimpl.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;
@@ -457,7 +457,7 @@ QString QgsPythonUtilsImpl::homePythonPath()
}
else
{
return '"' + settingsDir + "python\"";
return '"' + settingsDir.replace( '\\', "\\\\" ) + "python\"";
}
}

0 comments on commit 84c709f

Please sign in to comment.