Don't include qv4enginebase_p.h in qmldevtools

We don't need it and we don't need to check for V4_BOOTSTRAP in there.
Shuffle some includes around to provide everything we do need.

Change-Id: I3e75f1c6f9dc518006aabc9dcee21e5153899ac5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

6 files changed, 9 insertions, 7 deletions

diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h
index 82eccd9f3c..00876c71a2 100644
--- a/src/qml/jsruntime/qv4enginebase_p.h
+++ b/src/qml/jsruntime/qv4enginebase_p.h
@@ -79,9 +79,6 @@ struct Q_QML_EXPORT EngineBase {
 #elif defined(Q_ATOMIC_INT16_IS_SUPPORTED)
     quint8 unused = 0;
     QAtomicInteger<quint16> isInterrupted = false;
-#elif defined(V4_BOOTSTRAP)
-    // We don't need the isInterrupted flag when bootstrapping.
-    quint8 unused[3];
 #else
 #   error V4 needs either 8bit or 16bit atomics.
 #endif
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h
index d85b30a056..4f22dc7330 100644
--- a/src/qml/jsruntime/qv4managed_p.h
+++ b/src/qml/jsruntime/qv4managed_p.h
@@ -54,7 +54,6 @@
 #include "qv4value_p.h"
 #include "qv4enginebase_p.h"
 #include <private/qv4heap_p.h>
-#include <private/qv4writebarrier_p.h>
 #include <private/qv4vtable_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index f404aac580..107dfbda6f 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -1175,8 +1175,14 @@ Bool RuntimeHelpers::strictEqual(const Value &x, const Value &y)
 
     if (x.isNumber())
         return y.isNumber() && x.asDouble() == y.asDouble();
-    if (x.isManaged())
+    if (x.isManaged()) {
+#ifdef V4_BOOTSTRAP
+        Q_UNIMPLEMENTED();
+        return false;
+#else
         return y.isManaged() && x.cast<Managed>()->isEqualTo(y.cast<Managed>());
+#endif
+    }
     return false;
 }
 
diff --git a/src/qml/jsruntime/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h
index 78ab6a1822..349099f8d5 100644
--- a/src/qml/jsruntime/qv4runtime_p.h
+++ b/src/qml/jsruntime/qv4runtime_p.h
@@ -52,7 +52,6 @@
 
 #include "qv4global_p.h"
 #include "qv4value_p.h"
-#include "qv4context_p.h"
 #include "qv4math_p.h"
 #include "qv4runtimeapi_p.h"
 #include <QtCore/qnumeric.h>
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp
index 34d334a24d..9288d3e3b6 100644
--- a/src/qml/memory/qv4mm.cpp
+++ b/src/qml/memory/qv4mm.cpp
@@ -63,6 +63,7 @@
 #include "qv4profiling_p.h"
 #include "qv4mapobject_p.h"
 #include "qv4setobject_p.h"
+#include "qv4writebarrier_p.h"
 
 //#define MM_STATS
 
diff --git a/src/qml/memory/qv4writebarrier_p.h b/src/qml/memory/qv4writebarrier_p.h
index 8b04aa6cb1..c65cfc0269 100644
--- a/src/qml/memory/qv4writebarrier_p.h
+++ b/src/qml/memory/qv4writebarrier_p.h
@@ -51,7 +51,6 @@
 //
 
 #include <private/qv4global_p.h>
-#include <private/qv4enginebase_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -60,6 +59,7 @@ QT_BEGIN_NAMESPACE
 #define WRITEBARRIER(x) (1/WRITEBARRIER_##x == 1)
 
 namespace QV4 {
+struct EngineBase;
 
 namespace WriteBarrier {