Showing the changes to libraries/script-engine/src/qtscript/ScriptEngineQtScript.cpp (1 of 53 files). Show all
Unified · Split
| @@ -1,6 +1,6 @@ | |||
| 1 | // | 1 | // |
| 2 | // ScriptEngineQtScript.cpp | 2 | // ScriptEngineQtScript.cpp |
| 3 | // libraries/script-engine-qtscript/src | 3 | // libraries/script-engine/src/qtscript |
| 4 | // | 4 | // |
| 5 | // Created by Brad Hefta-Gaub on 12/14/13. | 5 | // Created by Brad Hefta-Gaub on 12/14/13. |
| 6 | // Copyright 2013 High Fidelity, Inc. | 6 | // Copyright 2013 High Fidelity, Inc. |
| @@ -869,11 +869,11 @@ ScriptProgramPointer ScriptEngineQtScript::newProgram(const QString& sourceCode, · 862 unmodified lines | |||
| 869 | return ScriptProgramPointer(new ScriptProgramQtWrapper(this, result)); | 869 | return ScriptProgramPointer(new ScriptProgramQtWrapper(this, result)); |
| 870 | } | 870 | } |
| 871 | 871 | ||
| 872 | ScriptValuePointer ScriptEngineQtScript::newQObject(QObject* obj, | 872 | ScriptValuePointer ScriptEngineQtScript::newQObject(QObject* object, |
| 873 | ScriptEngine::ValueOwnership ownership, | 873 | ScriptEngine::ValueOwnership ownership, |
| 874 | const ScriptEngine::QObjectWrapOptions& options) { | 874 | const ScriptEngine::QObjectWrapOptions& options) { |
| 875 | QScriptValue result = QScriptEngine::newQObject(obj, static_cast<QScriptEngine::ValueOwnership>(ownership), | 875 | QScriptValue result = QScriptEngine::newQObject(object, static_cast<QScriptEngine::ValueOwnership>(ownership), |
| 876 | (QScriptEngine::QObjectWrapOptions)(int)options); | 876 | (QScriptEngine::QObjectWrapOptions)((int)options | DEFAULT_QOBJECT_WRAP_OPTIONS)); |
| 877 | return ScriptValuePointer(new ScriptValueQtWrapper(this, std::move(result))); | 877 | return ScriptValuePointer(new ScriptValueQtWrapper(this, std::move(result))); |
| 878 | } | 878 | } |
| 879 | 879 | ||