Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits)
  Cocoa: cocoa sometimes show a hidden window
  Default (Parentless) QMenuBar actions do not work (without autotest)
  Reorganised double stream out operator in QDataStream to avoid causing unnecessary floating point exceptions.
  Revert "Report the error as being AlreadyExists if this is why it fails"
  Revert "Default (Parentless) QMenuBar actions do not work"
  fix memory bug
  fix nativeFilePath character width issue
  fix typos
  Just use the path as the url can have an anchor attached etc...
  Doc: Cleaning HTML generator and updating index.qdoc
  Default (Parentless) QMenuBar actions do not work
  Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCore
  qdoc: Avoided putting bad chars in links
  Improve itemview appearance on Mac
  Backport a few fixes to the Designer filteredit from Creator
  Doc: Correcting qdocconf files for assistant
  ScrollBar width not updated dynamically on Windows.
  [tst_qhostinfo] Modify multipleDifferentLookups to repeat hostnames
  [tst_qhostinfo] Properly clean up the cache and lookup threads.
  Remove redundant network configuration updates on startup.
  ...

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);
 }