diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-20 10:35:18 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-20 10:35:18 (GMT) |
| commit | dbdc9cb65c758d87738fbaadfa7b1c39e33e96a0 (patch) | |
| tree | 58b7bbd7aba7fc9f3feafdf84084ced8d90cadfb /src/script/bridge/qscriptvariant.cpp | |
| parent | 0a6faf00f06c8a0e2e0f4714bb14645172ee8922 (diff) | |
| parent | 7bec0ef0cd9ffb633586c820004607d2e3d66b07 (diff) | |
| download | Qt-dbdc9cb65c758d87738fbaadfa7b1c39e33e96a0.zip Qt-dbdc9cb65c758d87738fbaadfa7b1c39e33e96a0.tar.gz Qt-dbdc9cb65c758d87738fbaadfa7b1c39e33e96a0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/script/bridge/qscriptvariant.cpp')
| -rw-r--r-- | src/script/bridge/qscriptvariant.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/script/bridge/qscriptvariant.cpp b/src/script/bridge/qscriptvariant.cpp index b2dd3b0..93459a8 100644 --- a/src/script/bridge/qscriptvariant.cpp +++ b/src/script/bridge/qscriptvariant.cpp @@ -29,6 +29,8 @@ #include "Error.h" #include "PrototypeFunction.h" +#include "JSFunction.h" +#include "NativeFunctionWrapper.h" #include "JSString.h" namespace JSC @@ -139,8 +141,8 @@ QVariantPrototype::QVariantPrototype(JSC::ExecState* exec, WTF::PassRefPtr<JSC:: { setDelegate(new QVariantDelegate(QVariant())); - putDirectFunction(exec, new (exec) JSC::PrototypeFunction(exec, prototypeFunctionStructure, 0, exec->propertyNames().toString, variantProtoFuncToString), JSC::DontEnum); - putDirectFunction(exec, new (exec) JSC::PrototypeFunction(exec, prototypeFunctionStructure, 0, exec->propertyNames().valueOf, variantProtoFuncValueOf), JSC::DontEnum); + putDirectFunction(exec, new (exec) JSC::NativeFunctionWrapper(exec, prototypeFunctionStructure, 0, exec->propertyNames().toString, variantProtoFuncToString), JSC::DontEnum); + putDirectFunction(exec, new (exec) JSC::NativeFunctionWrapper(exec, prototypeFunctionStructure, 0, exec->propertyNames().valueOf, variantProtoFuncValueOf), JSC::DontEnum); } |