comparison 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
comparison
equal deleted inserted replaced
1449:deabf9fd3d28 1450:a12fd0456f0c
188 #ifdef HAVE_PLUGIN_CHECKER_HELPER 188 #ifdef HAVE_PLUGIN_CHECKER_HELPER
189 189
190 QMutexLocker locker(&m_mutex); 190 QMutexLocker locker(&m_mutex);
191 191
192 if (!m_succeeded) { 192 if (!m_succeeded) {
193 return QObject::tr("<b>Failed to scan for plugins</b>" 193 return QObject::tr("<b>Failed to scan for plugins</b>"
194 "<p>Failed to scan for plugins at startup. Possibly " 194 "<p>Failed to scan for plugins at startup. Possibly "
195 "the plugin checker program was not correctly " 195 "the plugin checker program was not correctly "
196 "installed alongside %1?</p>") 196 "installed alongside %1?</p>")
197 .arg(QCoreApplication::applicationName()); 197 .arg(QCoreApplication::applicationName());
198 } 198 }
199 if (m_kp.empty()) { 199 if (m_kp.empty()) {
200 return QObject::tr("<b>Did not scan for plugins</b>" 200 return QObject::tr("<b>Did not scan for plugins</b>"
201 "<p>Apparently no scan for plugins was attempted " 201 "<p>Apparently no scan for plugins was attempted "
202 "(internal error?)</p>"); 202 "(internal error?)</p>");
203 } 203 }
204 204
205 QString report; 205 QString report;
206 for (auto kp: m_kp) { 206 for (auto kp: m_kp) {
207 report += QString::fromStdString(kp.second->getFailureReport()); 207 report += QString::fromStdString(kp.second->getFailureReport());
208 } 208 }
209 if (report == "") { 209 if (report == "") {
210 return report; 210 return report;
211 } 211 }
212 212
213 return QObject::tr("<b>Failed to load plugins</b>" 213 return QObject::tr("<b>Failed to load plugins</b>"
214 "<p>Failed to load one or more plugin libraries:</p>") 214 "<p>Failed to load one or more plugin libraries:</p>")
215 + report 215 + report
216 + QObject::tr("<p>These plugins may be incompatible with the system, " 216 + QObject::tr("<p>These plugins may be incompatible with the system, "
217 "and will be ignored during this run of %1.</p>") 217 "and will be ignored during this run of %1.</p>")
218 .arg(QCoreApplication::applicationName()); 218 .arg(QCoreApplication::applicationName());
219 219
220 #else 220 #else