File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -434,17 +434,20 @@ void QgsPluginRegistry::restoreSessionPlugins( QString thePluginDirString )
434
434
{
435
435
QString packageName = pluginList[i];
436
436
437
+ // TODO: apply better solution for #5879
438
+ // start - temporary fix for issue #5879
437
439
if ( QgsApplication::isRunningFromBuildDir () )
438
440
{
439
441
if ( corePlugins.contains ( packageName ) )
440
442
{
441
- QgsApplication::setPkgDataPath ( QgsApplication::buildOutputPath ( ) );
443
+ QgsApplication::setPkgDataPath ( QString ( " " ) );
442
444
}
443
445
else
444
446
{
445
447
QgsApplication::setPkgDataPath ( QgsApplication::buildSourcePath () );
446
448
}
447
449
}
450
+ // end - temporary fix for issue #5879, more below
448
451
449
452
if ( checkPythonPlugin ( packageName ) )
450
453
{
@@ -456,10 +459,12 @@ void QgsPluginRegistry::restoreSessionPlugins( QString thePluginDirString )
456
459
}
457
460
}
458
461
}
462
+ // start - temporary fix for issue #5879, more above
459
463
if ( QgsApplication::isRunningFromBuildDir () )
460
464
{
461
465
QgsApplication::setPkgDataPath ( QgsApplication::buildSourcePath () );
462
466
}
467
+ // end - temporary fix for issue #5879
463
468
}
464
469
465
470
QgsDebugMsg ( " Plugin loading completed" );
You can’t perform that action at this time.
0 commit comments