Skip to content

Commit 9336e35

Browse files
committed
Update to e31fb3c
- Add comments about issue - Set pkgDataPath to empty QString for fix
1 parent a622d1b commit 9336e35

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/app/qgspluginregistry.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,17 +434,20 @@ void QgsPluginRegistry::restoreSessionPlugins( QString thePluginDirString )
434434
{
435435
QString packageName = pluginList[i];
436436

437+
// TODO: apply better solution for #5879
438+
// start - temporary fix for issue #5879
437439
if ( QgsApplication::isRunningFromBuildDir() )
438440
{
439441
if ( corePlugins.contains( packageName ) )
440442
{
441-
QgsApplication::setPkgDataPath( QgsApplication::buildOutputPath() );
443+
QgsApplication::setPkgDataPath( QString("") );
442444
}
443445
else
444446
{
445447
QgsApplication::setPkgDataPath( QgsApplication::buildSourcePath() );
446448
}
447449
}
450+
// end - temporary fix for issue #5879, more below
448451

449452
if ( checkPythonPlugin( packageName ) )
450453
{
@@ -456,10 +459,12 @@ void QgsPluginRegistry::restoreSessionPlugins( QString thePluginDirString )
456459
}
457460
}
458461
}
462+
// start - temporary fix for issue #5879, more above
459463
if ( QgsApplication::isRunningFromBuildDir() )
460464
{
461465
QgsApplication::setPkgDataPath( QgsApplication::buildSourcePath() );
462466
}
467+
// end - temporary fix for issue #5879
463468
}
464469

465470
QgsDebugMsg( "Plugin loading completed" );

0 commit comments

Comments
 (0)