Skip to content
Permalink
Browse files

Update to e31fb3c

- Add comments about issue
- Set pkgDataPath to empty QString for fix
  • Loading branch information
dakcarto committed Oct 25, 2012
1 parent a622d1b commit 9336e3547a2dd92b640e2d2d270ab61426d9505b
Showing with 6 additions and 1 deletion.
  1. +6 −1 src/app/qgspluginregistry.cpp
@@ -434,17 +434,20 @@ void QgsPluginRegistry::restoreSessionPlugins( QString thePluginDirString )
{
QString packageName = pluginList[i];

// TODO: apply better solution for #5879
// start - temporary fix for issue #5879
if ( QgsApplication::isRunningFromBuildDir() )
{
if ( corePlugins.contains( packageName ) )
{
QgsApplication::setPkgDataPath( QgsApplication::buildOutputPath() );
QgsApplication::setPkgDataPath( QString("") );
}
else
{
QgsApplication::setPkgDataPath( QgsApplication::buildSourcePath() );
}
}
// end - temporary fix for issue #5879, more below

if ( checkPythonPlugin( packageName ) )
{
@@ -456,10 +459,12 @@ void QgsPluginRegistry::restoreSessionPlugins( QString thePluginDirString )
}
}
}
// start - temporary fix for issue #5879, more above
if ( QgsApplication::isRunningFromBuildDir() )
{
QgsApplication::setPkgDataPath( QgsApplication::buildSourcePath() );
}
// end - temporary fix for issue #5879
}

QgsDebugMsg( "Plugin loading completed" );

0 comments on commit 9336e35

Please sign in to comment.
You can’t perform that action at this time.