History

remove requirement of ScriptEngine in ScriptEngines slots

Stephen Birarda committed 9 years ago

Commit c63a2c91 parent a4d72c44 files · +18 −28Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+4−4
@@ -464,17 +464,17 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { · 463 unmodified lines
464 464
465void ScriptEngine::scriptErrorMessage(const QString& message) {465void ScriptEngine::scriptErrorMessage(const QString& message) {
466 qCCritical(scriptengine) << qPrintable(message);466 qCCritical(scriptengine) << qPrintable(message);
467 emit errorMessage(message);467 emit errorMessage(message, getFilename());
468}468}
469 469
470void ScriptEngine::scriptWarningMessage(const QString& message) {470void ScriptEngine::scriptWarningMessage(const QString& message) {
471 qCWarning(scriptengine) << message;471 qCWarning(scriptengine) << message;
472 emit warningMessage(message);472 emit warningMessage(message, getFilename());
473}473}
474 474
475void ScriptEngine::scriptInfoMessage(const QString& message) {475void ScriptEngine::scriptInfoMessage(const QString& message) {
476 qCInfo(scriptengine) << message;476 qCInfo(scriptengine) << message;
477 emit infoMessage(message);477 emit infoMessage(message, getFilename());
478}478}
479 479
480// Even though we never pass AnimVariantMap directly to and from javascript, the queued invokeMethod of480// Even though we never pass AnimVariantMap directly to and from javascript, the queued invokeMethod of
@@ -1351,7 +1351,7 @@ QUrl ScriptEngine::resourcesPath() const { · 870 unmodified lines
1351}1351}
1352 1352
1353void ScriptEngine::print(const QString& message) {1353void ScriptEngine::print(const QString& message) {
1354 emit printedMessage(message);1354 emit printedMessage(message, getFilename());
1355}1355}
1356 1356
1357// Script.require.resolve -- like resolvePath, but performs more validation and throws exceptions on invalid module identifiers (for consistency with Node.js)1357// Script.require.resolve -- like resolvePath, but performs more validation and throws exceptions on invalid module identifiers (for consistency with Node.js)