History

Merge branch 'master' into 21114-part3

humbletim committed 9 years ago

Commit 758c07c2 parents 366c90e 31e0cfe74 files · +1126 −1796Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−2
@@ -150,7 +150,7 @@ QString encodeEntityIdIntoEntityUrl(const QString& url, const QString& entityID) · 149 unmodified lines
150 150
151QString ScriptEngine::logException(const QScriptValue& exception) {151QString ScriptEngine::logException(const QScriptValue& exception) {
152 auto message = formatException(exception, _enableExtendedJSExceptions.get());152 auto message = formatException(exception, _enableExtendedJSExceptions.get());
153 scriptErrorMessage(qPrintable(message));153 scriptErrorMessage(message);
154 return message;154 return message;
155}155}
156 156
@@ -461,7 +461,7 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { · 304 unmodified lines
461}461}
462 462
463void ScriptEngine::scriptErrorMessage(const QString& message) {463void ScriptEngine::scriptErrorMessage(const QString& message) {
464 qCCritical(scriptengine) << message;464 qCCritical(scriptengine) << qPrintable(message);
465 emit errorMessage(message);465 emit errorMessage(message);
466}466}
467 467