History

Fixed enums in scripting engine

ksuprynowicz committed 4 years ago

Commit ad57a5e1 parent b27e81911 files · +55 −14Browse files

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

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+3−7
@@ -575,17 +575,13 @@ static ScriptValue createScriptableResourcePrototype(ScriptManagerPointer manage · 574 unmodified lines
575575 auto engine = manager->engine();
576576 auto prototype = engine->newObject();
577577
578− // Expose enum State to JS/QML via properties
579− QObject* state = new QObject(manager.get());
580− state->setObjectName("ResourceState");
578+ auto state = engine->newObject();
581579 auto metaEnum = QMetaEnum::fromType<ScriptableResource::State>();
582580 for (int i = 0; i < metaEnum.keyCount(); ++i) {
583− state->setProperty(metaEnum.key(i), metaEnum.value(i));
581+ state.setProperty(metaEnum.key(i), metaEnum.value(i));
584582 }
585583
586− auto prototypeState = engine->newQObject(state, ScriptEngine::QtOwnership,
587− ScriptEngine::ExcludeSlots | ScriptEngine::ExcludeSuperClassMethods);
588− prototype.setProperty("State", prototypeState);
584+ prototype.setProperty("State", state);
589585
590586 return prototype;
591587 }