Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all
Unified · Split
| @@ -107,10 +107,13 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) { · 106 unmodified lines | ||
| 107 | 107 | } |
| 108 | 108 | message += context->argument(i).toString(); |
| 109 | 109 | } |
| 110 | − qCDebug(scriptengineScript).noquote() << message; // noquote() so that \n is treated as newline | |
| 111 | 110 | |
| 112 | 111 | if (ScriptEngine *scriptEngine = qobject_cast<ScriptEngine*>(engine)) { |
| 113 | 112 | scriptEngine->print(message); |
| 113 | + // prefix the script engine name to help disambiguate messages in the main debug log | |
| 114 | + qCDebug(scriptengineScript, "[%s] %s", qUtf8Printable(scriptEngine->getFilename()), qUtf8Printable(message)); | |
| 115 | + } else { | |
| 116 | + qCDebug(scriptengineScript, "%s", qUtf8Printable(message)); | |
| 114 | 117 | } |
| 115 | 118 | |
| 116 | 119 | return QScriptValue(); |
| @@ -465,22 +468,22 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { · 348 unmodified lines | ||
| 465 | 468 | } |
| 466 | 469 | |
| 467 | 470 | void ScriptEngine::scriptErrorMessage(const QString& message) { |
| 468 | − qCCritical(scriptengine) << qPrintable(message); | |
| 471 | + qCCritical(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message)); | |
| 469 | 472 | emit errorMessage(message, getFilename()); |
| 470 | 473 | } |
| 471 | 474 | |
| 472 | 475 | void ScriptEngine::scriptWarningMessage(const QString& message) { |
| 473 | − qCWarning(scriptengine) << qPrintable(message); | |
| 476 | + qCWarning(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message)); | |
| 474 | 477 | emit warningMessage(message, getFilename()); |
| 475 | 478 | } |
| 476 | 479 | |
| 477 | 480 | void ScriptEngine::scriptInfoMessage(const QString& message) { |
| 478 | − qCInfo(scriptengine) << qPrintable(message); | |
| 481 | + qCInfo(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message)); | |
| 479 | 482 | emit infoMessage(message, getFilename()); |
| 480 | 483 | } |
| 481 | 484 | |
| 482 | 485 | void ScriptEngine::scriptPrintedMessage(const QString& message) { |
| 483 | − qCDebug(scriptengine) << qPrintable(message); | |
| 486 | + qCDebug(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message)); | |
| 484 | 487 | emit printedMessage(message, getFilename()); |
| 485 | 488 | } |
| 486 | 489 | |