Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all
Unified · Split
| @@ -636,7 +636,7 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi · 635 unmodified lines | ||
| 636 | 636 | QScriptValue result; |
| 637 | 637 | #ifdef THREAD_DEBUGGING |
| 638 | 638 | qDebug() << "*** WARNING *** ScriptEngine::evaluate() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] " |
| 639 | − "sourceCode:" << sourceCode << " fileName:" << fileName << "lineNumber:" << lineNumber; | |
| 639 | + "sourceCode:" << sourceCode << " fileName:" << fileName << "lineNumber:" << lineNumber; | |
| 640 | 640 | #endif |
| 641 | 641 | QMetaObject::invokeMethod(this, "evaluate", Qt::BlockingQueuedConnection, |
| 642 | 642 | Q_RETURN_ARG(QScriptValue, result), |
| @@ -1015,7 +1015,8 @@ void ScriptEngine::forwardHandlerCall(const EntityItemID& entityID, const QStrin · 372 unmodified lines | ||
| 1015 | 1015 | void ScriptEngine::loadEntityScript(const EntityItemID& entityID, const QString& entityScript, bool forceRedownload) { |
| 1016 | 1016 | if (QThread::currentThread() != thread()) { |
| 1017 | 1017 | #ifdef THREAD_DEBUGGING |
| 1018 | − qDebug() << "*** WARNING *** ScriptEngine::loadEntityScript() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] " | |
| 1018 | + qDebug() << "*** WARNING *** ScriptEngine::loadEntityScript() called on wrong thread [" | |
| 1019 | + << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] " | |
| 1019 | 1020 | "entityID:" << entityID << "entityScript:" << entityScript <<"forceRedownload:" << forceRedownload; |
| 1020 | 1021 | #endif |
| 1021 | 1022 | |
| @@ -1052,8 +1053,10 @@ void ScriptEngine::loadEntityScript(const EntityItemID& entityID, const QString& · 30 unmodified lines | ||
| 1052 | 1053 | void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, const QString& scriptOrURL, const QString& contents, bool isURL, bool success) { |
| 1053 | 1054 | if (QThread::currentThread() != thread()) { |
| 1054 | 1055 | #ifdef THREAD_DEBUGGING |
| 1055 | − qDebug() << "*** WARNING *** ScriptEngine::entityScriptContentAvailable() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] " | |
| 1056 | − "entityID:" << entityID << "scriptOrURL:" << scriptOrURL << "contents:" << contents << "isURL:" << isURL << "success:" << success; | |
| 1056 | + qDebug() << "*** WARNING *** ScriptEngine::entityScriptContentAvailable() called on wrong thread [" | |
| 1057 | + << QThread::currentThread() << "], invoking on correct thread [" << thread() | |
| 1058 | + << "] " "entityID:" << entityID << "scriptOrURL:" << scriptOrURL << "contents:" | |
| 1059 | + << contents << "isURL:" << isURL << "success:" << success; | |
| 1057 | 1060 | #endif |
| 1058 | 1061 | |
| 1059 | 1062 | QMetaObject::invokeMethod(this, "entityScriptContentAvailable", |