# HG changeset patch # User Chris Cannam # Date 1541169660 0 # Node ID 175ef02c7864d91a22f8458d1c0ac922d2314682 # Parent 830972646ccd80e3d2694d5bee381c4d11ef0da5# Parent d3814e07b8aa5fb5e036c061c93e9ec08ac7a8d0 Merge diff -r d3814e07b8aa -r 175ef02c7864 plugin/PluginScan.cpp --- a/plugin/PluginScan.cpp Thu Nov 01 15:01:41 2018 +0000 +++ b/plugin/PluginScan.cpp Fri Nov 02 14:41:00 2018 +0000 @@ -190,7 +190,7 @@ os << "
" + f.library + "
";
SVDEBUG << "PluginScan::formatFailureReport: tag is \"" << tag
<< "\", failure code is " << int(f.code) << ", message is \""
@@ -225,6 +225,11 @@
("Library cannot be loaded: %1").arg(userMessage);
break;
+ case PluginCheckCode::FAIL_FORBIDDEN:
+ userMessage = QObject::tr
+ ("Permission to load library was refused");
+ break;
+
case PluginCheckCode::FAIL_DESCRIPTOR_MISSING:
userMessage = QObject::tr
("Not a valid plugin library (no descriptor found)");
@@ -298,8 +303,7 @@
return report;
}
- return QObject::tr("Failed to load plugins"
- "Failed to load one or more plugin libraries:
") + return QObject::tr("Failed to load one or more plugin libraries:
") + report + QObject::tr("These plugins may be incompatible with the system, " "and will be ignored during this run of %1.
")