Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all
Unified · Split
| @@ -2120,7 +2120,7 @@ void ScriptEngine::updateEntityScriptStatus(const EntityItemID& entityID, const · 2119 unmodified lines | |||
| 2120 | } | 2120 | } |
| 2121 | 2121 | ||
| 2122 | QVariant ScriptEngine::cloneEntityScriptDetails(const EntityItemID& entityID) { | 2122 | QVariant ScriptEngine::cloneEntityScriptDetails(const EntityItemID& entityID) { |
| 2123 | static const QVariant NULL_VARIANT { qVariantFromValue((QObject*)nullptr) }; | 2123 | static const QVariant NULL_VARIANT = QVariant::fromValue(nullptr); |
| 2124 | QVariantMap map; | 2124 | QVariantMap map; |
| 2125 | if (entityID.isNull()) { | 2125 | if (entityID.isNull()) { |
| 2126 | // TODO: find better way to report JS Error across thread/process boundaries | 2126 | // TODO: find better way to report JS Error across thread/process boundaries |