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