Mercurial > hg > svcore
diff plugin/PluginScan.cpp @ 1450:a12fd0456f0c streaming-csv-writer
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 17 Apr 2018 10:35:42 +0100 |
parents | 48e9f538e6e9 |
children | dcff44a76573 |
line wrap: on
line diff
--- a/plugin/PluginScan.cpp Tue Apr 17 10:03:51 2018 +0100 +++ b/plugin/PluginScan.cpp Tue Apr 17 10:35:42 2018 +0100 @@ -190,16 +190,16 @@ QMutexLocker locker(&m_mutex); if (!m_succeeded) { - return QObject::tr("<b>Failed to scan for plugins</b>" - "<p>Failed to scan for plugins at startup. Possibly " + return QObject::tr("<b>Failed to scan for plugins</b>" + "<p>Failed to scan for plugins at startup. Possibly " "the plugin checker program was not correctly " "installed alongside %1?</p>") .arg(QCoreApplication::applicationName()); } if (m_kp.empty()) { - return QObject::tr("<b>Did not scan for plugins</b>" - "<p>Apparently no scan for plugins was attempted " - "(internal error?)</p>"); + return QObject::tr("<b>Did not scan for plugins</b>" + "<p>Apparently no scan for plugins was attempted " + "(internal error?)</p>"); } QString report; @@ -207,12 +207,12 @@ report += QString::fromStdString(kp.second->getFailureReport()); } if (report == "") { - return report; + return report; } return QObject::tr("<b>Failed to load plugins</b>" - "<p>Failed to load one or more plugin libraries:</p>") - + report + "<p>Failed to load one or more plugin libraries:</p>") + + report + QObject::tr("<p>These plugins may be incompatible with the system, " "and will be ignored during this run of %1.</p>") .arg(QCoreApplication::applicationName());