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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.cpp
index 6f23c7d..dab7f51 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.cpp
@@ -168,14 +168,14 @@ inline void Structure::transitionTableAdd(const StructureTransitionTableHash::Ke
     if (!specificValue) {
         TransitionTable::iterator find = transitionTable()->find(key);
         if (find == transitionTable()->end())
-            transitionTable()->add(key, Transition(structure, 0));
+            transitionTable()->add(key, Transition(structure, (Structure*)0));
         else
             find->second.first = structure;
     } else {
         // If we're adding a transition to a specific value, then there cannot be
         // an existing transition
         ASSERT(!transitionTable()->contains(key));
-        transitionTable()->add(key, Transition(0, structure));
+        transitionTable()->add(key, Transition((Structure*)0, structure));
     }
 }