History

Merge pull request #4252 from thoys/20224

CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads

Andrew Meadows committed 11 years ago

Commit d896f3a2 parents ac93f86 062c2cb11 files · +749 −259Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−1
@@ -272,8 +272,12 @@ QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* ob · 271 unmodified lines
272}272}
273 273
274void ScriptEngine::registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments) {274void ScriptEngine::registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments) {
275 registerFunction(globalObject(), name, fun, numArguments);
276}
277
278void ScriptEngine::registerFunction(QScriptValue parent, const QString& name, QScriptEngine::FunctionSignature fun, int numArguments) {
275 QScriptValue scriptFun = newFunction(fun, numArguments);279 QScriptValue scriptFun = newFunction(fun, numArguments);
276 globalObject().setProperty(name, scriptFun);280 parent.setProperty(name, scriptFun);
277}281}
278 282
279void ScriptEngine::registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter,283void ScriptEngine::registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter,