Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 276 files). Show all
Unified · Split
| @@ -81,6 +81,9 @@ void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) { · 80 unmodified lines | ||
| 81 | 81 | out = qobject_cast<AvatarData*>(object.toQObject()); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | +Q_DECLARE_METATYPE(controller::InputController*) | |
| 85 | +static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>(); | |
| 86 | + | |
| 84 | 87 | QScriptValue inputControllerToScriptValue(QScriptEngine *engine, controller::InputController* const &in) { |
| 85 | 88 | return engine->newQObject(in); |
| 86 | 89 | } |
| @@ -89,8 +92,6 @@ void inputControllerFromScriptValue(const QScriptValue &object, controller::Inpu · 2 unmodified lines | ||
| 89 | 92 | out = qobject_cast<controller::InputController*>(object.toQObject()); |
| 90 | 93 | } |
| 91 | 94 | |
| 92 | − | |
| 93 | − | |
| 94 | 95 | static bool hasCorrectSyntax(const QScriptProgram& program) { |
| 95 | 96 | const auto syntaxCheck = QScriptEngine::checkSyntax(program.sourceCode()); |
| 96 | 97 | if (syntaxCheck.state() != QScriptSyntaxCheckResult::Valid) { |
| @@ -673,7 +674,6 @@ void ScriptEngine::run() { · 576 unmodified lines | ||
| 673 | 674 | } |
| 674 | 675 | |
| 675 | 676 | _isRunning = true; |
| 676 | − _isFinished = false; | |
| 677 | 677 | if (_wantSignals) { |
| 678 | 678 | emit runningStateChanged(); |
| 679 | 679 | } |