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.h (1 of 11 files). Show all

Unified · Split

@@ -58,6 +58,8 @@ public: · 57 unmodified lines
58	58	void registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter,
59	59	QScriptEngine::FunctionSignature setter, QScriptValue object = QScriptValue::NullValue);
60	60	void registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments = -1);
	61	+ void registerFunction(QScriptValue parent, const QString& name, QScriptEngine::FunctionSignature fun,
	62	+ int numArguments = -1);
61	63
62	64	Q_INVOKABLE void setIsAvatar(bool isAvatar);
63	65	bool isAvatar() const { return _isAvatar; }