History

Register metatypes, fixes warnings

Remove executeOnScriptThread from Script JS API -- seems unused, is marked deprecated, and for some reason registration didn't resolve the warnings.

Dale Glass committed 3 years ago

Commit aec756b1 parent 8f827502 files · +9 −1Browse files

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

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+4−0
@@ -261,6 +261,7 @@ ScriptManager::ScriptManager(Context context, const QString& scriptContents, con · 260 unmodified lines
261 _fileNameString(fileNameString),261 _fileNameString(fileNameString),
262 _assetScriptingInterface(new AssetScriptingInterface(this))262 _assetScriptingInterface(new AssetScriptingInterface(this))
263{263{
264
264 switch (_context) {265 switch (_context) {
265 case Context::CLIENT_SCRIPT:266 case Context::CLIENT_SCRIPT:
266 _type = Type::CLIENT;267 _type = Type::CLIENT;
@@ -279,6 +280,9 @@ ScriptManager::ScriptManager(Context context, const QString& scriptContents, con · 12 unmodified lines
279 break;280 break;
280 }281 }
281 282
283 qRegisterMetaType<ScriptValue>();
284 qRegisterMetaType<std::function<void()>>();
285
282 _scriptingInterface = std::make_shared<ScriptManagerScriptingInterface>(this);286 _scriptingInterface = std::make_shared<ScriptManagerScriptingInterface>(this);
283 287
284 if (isEntityServerScript()) {288 if (isEntityServerScript()) {