Don't include v8.h from qv8engine_p.h anymore

Change-Id: Idb0f5744f65b28acbe878a3e9d33b4a3946ecab8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/particles/qquickv8particledata.cpp b/src/particles/qquickv8particledata.cpp
index 9d0307e..a4a0298 100644 (file)
--- a/src/particles/qquickv8particledata.cpp
+++ b/src/particles/qquickv8particledata.cpp
@@ -46,6 +46,8 @@
 #include <private/qv4engine_p.h>
 #include <private/qv4functionobject_p.h>
 
+#include <private/qv8objectresource_p.h>
+
 QT_BEGIN_NAMESPACE
 
 /*!

diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index af34e99..597c12d 100644 (file)
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -63,6 +63,9 @@
 #include <QtCore/qstack.h>
 #include <QtCore/qdebug.h>
 
+#include <private/qv4v8_p.h>
+#include <private/qv8objectresource_p.h>
+
 #ifndef QT_NO_XMLSTREAMREADER
 
 #define V8THROW_REFERENCE(string) { \

diff --git a/src/qml/qml/v4/qv4serialize.cpp b/src/qml/qml/v4/qv4serialize.cpp
index a9b95ce..0860e27 100644 (file)
--- a/src/qml/qml/v4/qv4serialize.cpp
+++ b/src/qml/qml/v4/qv4serialize.cpp
@@ -51,6 +51,9 @@
 #include <private/qv4sequenceobject_p.h>
 #include <private/qv4objectproto_p.h>
 
+#include <private/qv4v8_p.h>
+#include <private/qv8objectresource_p.h>
+
 QT_BEGIN_NAMESPACE
 
 using namespace QV4;

diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index fcd5268..8ef670d 100644 (file)
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -78,6 +78,9 @@
 #include <private/qv4include_p.h>
 #include <private/qv4jsonobject_p.h>
 
+#include <private/qv4v8_p.h>
+#include <private/qv8objectresource_p.h>
+
 Q_DECLARE_METATYPE(QList<int>)
 
 
@@ -403,7 +406,7 @@ QVariant QV8Engine::toBasicVariant(const QV4::Value &value)
 
 
 
-void QV8Engine::initializeGlobal(v8::Handle<v8::Object> global)
+void QV8Engine::initializeGlobal()
 {
     QV4::GlobalExtensions::init(m_engine, m_v4Engine->globalObject);
 
@@ -490,7 +493,7 @@ void QV8Engine::setExtensionData(int index, Deletable *data)
 
 void QV8Engine::initQmlGlobalObject()
 {
-    initializeGlobal(QV4::Value::fromObject(m_v4Engine->globalObject));
+    initializeGlobal();
     freezeObject(QV4::Value::fromObject(m_v4Engine->globalObject));
 }
 

diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index c7508ba..c69c692 100644 (file)
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -62,7 +62,6 @@
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QThreadStorage>
 
-#include <private/qv8_p.h>
 #include <qjsengine.h>
 #include <qjsvalue.h>
 #include "qjsvalueiterator_p.h"
@@ -70,7 +69,6 @@
 
 #include <private/qqmlpropertycache_p.h>
 
-#include "qv8objectresource_p.h"
 #include <private/qv4qobjectwrapper_p.h>
 #include <private/qv4value_p.h>
 #include <private/qv4object_p.h>
@@ -137,19 +135,6 @@ namespace QV4 {
         return rv; \
     } \
 
-template<class T>
-inline T *v8_resource_cast(v8::Handle<v8::Object> object) {
-    QV8ObjectResource *resource = static_cast<QV8ObjectResource *>(object->GetExternalResource());
-    return (resource && (quint32)resource->resourceType() == (quint32)T::V8ResourceType)?static_cast<T *>(resource):0;
-}
-
-template<class T>
-inline T *v8_resource_check(v8::Handle<v8::Object> object) {
-    T *resource = static_cast<T *>(object->GetExternalResource());
-    Q_ASSERT(resource && resource->resourceType() == (quint32)T::V8ResourceType);
-    return resource;
-}
-
 // Used to allow a QObject method take and return raw V8 handles without having to expose
 // v8 in the public API.
 // Use like this:
@@ -324,7 +309,7 @@ protected:
 
     QVariant toBasicVariant(const QV4::Value &);
 
-    void initializeGlobal(v8::Handle<v8::Object>);
+    void initializeGlobal();
 
 private:
     QVariantList variantListFromJS(QV4::ArrayObject *array, V8ObjectSet &visitedObjects);

diff --git a/src/qml/qml/v8/qv8objectresource_p.h b/src/qml/qml/v8/qv8objectresource_p.h
index ad35abc..a112a33 100644 (file)
--- a/src/qml/qml/v8/qv8objectresource_p.h
+++ b/src/qml/qml/v8/qv8objectresource_p.h
@@ -77,6 +77,19 @@ public:
     QV8Engine *engine;
 };
 
+template<class T>
+inline T *v8_resource_cast(v8::Handle<v8::Object> object) {
+    QV8ObjectResource *resource = static_cast<QV8ObjectResource *>(object->GetExternalResource());
+    return (resource && (quint32)resource->resourceType() == (quint32)T::V8ResourceType)?static_cast<T *>(resource):0;
+}
+
+template<class T>
+inline T *v8_resource_check(v8::Handle<v8::Object> object) {
+    T *resource = static_cast<T *>(object->GetExternalResource());
+    Q_ASSERT(resource && resource->resourceType() == (quint32)T::V8ResourceType);
+    return resource;
+}
+
 QT_END_NAMESPACE
 
 #endif // QV8OBJECTRESOURCE_P_H

diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index bf06d92..986290d 100644 (file)
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -68,6 +68,8 @@
 #include <private/qv4value_p.h>
 #include <private/qv4functionobject_p.h>
 
+#include <private/qv8objectresource_p.h>
+
 #if defined(Q_OS_QNX) || defined(Q_OS_ANDROID)
 #include <ctype.h>
 #endif