History

include the source basename in Script.print() && QML/Script console.*() debug output

humbletim committed 9 years ago

Commit fd917911 parent e7705172 files · +15 −5Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+8−5
@@ -107,10 +107,13 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) { · 106 unmodified lines
107 }107 }
108 message += context->argument(i).toString();108 message += context->argument(i).toString();
109 }109 }
110 qCDebug(scriptengineScript).noquote() << message; // noquote() so that \n is treated as newline
111 110
112 if (ScriptEngine *scriptEngine = qobject_cast<ScriptEngine*>(engine)) {111 if (ScriptEngine *scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
113 scriptEngine->print(message);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 return QScriptValue();119 return QScriptValue();
@@ -465,22 +468,22 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { · 348 unmodified lines
465}468}
466 469
467void ScriptEngine::scriptErrorMessage(const QString& message) {470void ScriptEngine::scriptErrorMessage(const QString& message) {
468 qCCritical(scriptengine) << qPrintable(message);471 qCCritical(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
469 emit errorMessage(message, getFilename());472 emit errorMessage(message, getFilename());
470}473}
471 474
472void ScriptEngine::scriptWarningMessage(const QString& message) {475void ScriptEngine::scriptWarningMessage(const QString& message) {
473 qCWarning(scriptengine) << qPrintable(message);476 qCWarning(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
474 emit warningMessage(message, getFilename());477 emit warningMessage(message, getFilename());
475}478}
476 479
477void ScriptEngine::scriptInfoMessage(const QString& message) {480void ScriptEngine::scriptInfoMessage(const QString& message) {
478 qCInfo(scriptengine) << qPrintable(message);481 qCInfo(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
479 emit infoMessage(message, getFilename());482 emit infoMessage(message, getFilename());
480}483}
481 484
482void ScriptEngine::scriptPrintedMessage(const QString& message) {485void ScriptEngine::scriptPrintedMessage(const QString& message) {
483 qCDebug(scriptengine) << qPrintable(message);486 qCDebug(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
484 emit printedMessage(message, getFilename());487 emit printedMessage(message, getFilename());
485}488}
486 489