Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Conflicts:
      examples/quick/shared/LauncherList.qml
      src/quick/items/qquickevents.cpp
      src/quick/items/qquickevents_p_p.h
      src/quick/items/qquickwindow.cpp
      tests/auto/quick/touchmouse/tst_touchmouse.cpp

Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b

1 files changed, 9 insertions, 6 deletions

diff --git a/src/qml/memory/qv4writebarrier_p.h b/src/qml/memory/qv4writebarrier_p.h
index e36ea0749a..86fd28000d 100644
--- a/src/qml/memory/qv4writebarrier_p.h
+++ b/src/qml/memory/qv4writebarrier_p.h
@@ -123,7 +123,7 @@ struct Pointer {
         return base;
     }
 
-    void set(ExecutionEngine *e, T newVal) {
+    void set(EngineBase *e, T newVal) {
         WriteBarrier::write(e, base(), reinterpret_cast<Heap::Base **>(&ptr), reinterpret_cast<Heap::Base *>(newVal));
     }
 
@@ -146,9 +146,12 @@ struct HeapValue : Value {
         return base;
     }
 
-    void set(ExecutionEngine *e, const Value &newVal) {
+    void set(EngineBase *e, const Value &newVal) {
         WriteBarrier::write(e, base(), this, newVal);
     }
+    void set(EngineBase *e, Heap::Base *b) {
+        WriteBarrier::write(e, base(), this, b);
+    }
 };
 
 template <size_t offset>
@@ -163,10 +166,10 @@ struct ValueArray {
         return base;
     }
 
-    void set(ExecutionEngine *e, uint index, Value v) {
+    void set(EngineBase *e, uint index, Value v) {
         WriteBarrier::write(e, base(), values + index, v);
     }
-    void set(ExecutionEngine *e, uint index, Heap::Base *b) {
+    void set(EngineBase *e, uint index, Heap::Base *b) {
         WriteBarrier::write(e, base(), values + index, b);
     }
     inline const Value &operator[] (uint index) const {
@@ -177,13 +180,13 @@ struct ValueArray {
         return values;
     }
 
-    void insertData(ExecutionEngine *e, uint index, Value v) {
+    void insertData(EngineBase *e, uint index, Value v) {
         for (uint i = size - 1; i > index; --i) {
             values[i] = values[i - 1];
         }
         set(e, index, v);
     }
-    void removeData(ExecutionEngine *e, uint index, int n = 1) {
+    void removeData(EngineBase *e, uint index, int n = 1) {
         Q_UNUSED(e);
         for (uint i = index; i < size - n; ++i) {
             values[i] = values[i + n];