update-path-under-home-directory-homePythonPath-and-.patch

Minoru Akagi, 2013-04-07 07:58 AM

Download (1.6 KB)

View differences:

src/app/main.cpp
276 276 
#if defined(ANDROID)
277 277 
  QgsDebugMsg( QString( "Android: All params stripped" ) );// Param %1" ).arg( argv[0] ) );
278 278 
  //put all QGIS settings in the same place
279 
  configpath = QDir::homePath() + QString( "/.qgis/" );
279 
  configpath = QDir::homePath() + QString( "/.qgis2/" );
280 280 
  QgsDebugMsg( QString( "Android: configpath set to %1" ).arg( configpath ) );
281 281 
#elif defined(Q_WS_WIN)
282 282 
  for ( int i = 1; i < argc; i++ )
src/python/qgspythonutilsimpl.cpp
451 451 
QString QgsPythonUtilsImpl::homePythonPath()
452 452 
{
453 453 
  QString settingsDir = QgsApplication::qgisSettingsDirPath();
454 
  if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + "/.qgis" )
454 
  if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + "/.qgis2" )
455 455 
  {
456 
    return "os.path.expanduser(\"~/.qgis/python\")";
456 
    return "os.path.expanduser(\"~/.qgis2/python\")";
457 457 
  }
458 458 
  else
459 459 
  {
460 
-