Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all
Unified · Split
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | #include <QtNetwork/QNetworkReply> | 18 | #include <QtNetwork/QNetworkReply> |
| 19 | #include <QtScript/QScriptEngine> | 19 | #include <QtScript/QScriptEngine> |
| 20 | #include <QtScript/QScriptValue> | 20 | #include <QtScript/QScriptValue> |
| 21 | #include <QtScript/QScriptValueIterator> | ||
| 21 | #include <QtCore/QStringList> | 22 | #include <QtCore/QStringList> |
| 22 | 23 | ||
| 23 | #include <AudioConstants.h> | 24 | #include <AudioConstants.h> |
| @@ -1072,7 +1073,6 @@ void ScriptEngine::loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const · 1048 unmodified lines | |||
| 1072 | // since all of these operations can be asynch we will always do the actual work in the response handler | 1073 | // since all of these operations can be asynch we will always do the actual work in the response handler |
| 1073 | // for the download | 1074 | // for the download |
| 1074 | void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, const QString& scriptOrURL, const QString& contents, bool isURL, bool success) { | 1075 | void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, const QString& scriptOrURL, const QString& contents, bool isURL, bool success) { |
| 1075 | |||
| 1076 | if (QThread::currentThread() != thread()) { | 1076 | if (QThread::currentThread() != thread()) { |
| 1077 | #ifdef THREAD_DEBUGGING | 1077 | #ifdef THREAD_DEBUGGING |
| 1078 | qDebug() << "*** WARNING *** ScriptEngine::entityScriptContentAvailable() called on wrong thread [" | 1078 | qDebug() << "*** WARNING *** ScriptEngine::entityScriptContentAvailable() called on wrong thread [" |
| @@ -1184,8 +1184,6 @@ void ScriptEngine::unloadEntityScript(const EntityItemID& entityID) { · 105 unmodified lines | |||
| 1184 | } | 1184 | } |
| 1185 | } | 1185 | } |
| 1186 | 1186 | ||
| 1187 | #include <QScriptValueIterator> | ||
| 1188 | |||
| 1189 | void ScriptEngine::unloadAllEntityScripts() { | 1187 | void ScriptEngine::unloadAllEntityScripts() { |
| 1190 | if (QThread::currentThread() != thread()) { | 1188 | if (QThread::currentThread() != thread()) { |
| 1191 | #ifdef THREAD_DEBUGGING | 1189 | #ifdef THREAD_DEBUGGING |