History

Fix InputController (Leap Motion) not able to be created

David Rowe committed 10 years ago

Commit e25d4c11 parent dde01b23 files · +11 −10Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−2
@@ -81,6 +81,9 @@ void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) { · 80 unmodified lines
8181 out = qobject_cast<AvatarData*>(object.toQObject());
8282 }
8383
84+Q_DECLARE_METATYPE(controller::InputController*)
85+static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
86+
8487 QScriptValue inputControllerToScriptValue(QScriptEngine *engine, controller::InputController* const &in) {
8588 return engine->newQObject(in);
8689 }
@@ -89,8 +92,6 @@ void inputControllerFromScriptValue(const QScriptValue &object, controller::Inpu · 2 unmodified lines
8992 out = qobject_cast<controller::InputController*>(object.toQObject());
9093 }
9194
92−
93−
9495 static bool hasCorrectSyntax(const QScriptProgram& program) {
9596 const auto syntaxCheck = QScriptEngine::checkSyntax(program.sourceCode());
9697 if (syntaxCheck.state() != QScriptSyntaxCheckResult::Valid) {