Move QV4::QObjectWrapper into the v4/ subdirectory

Change-Id: I1c5b3e343e259adbf2f1ff3fa7b2ff225eb9b192
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/qml/qml/v4/qv4engine.cpp b/src/qml/qml/v4/qv4engine.cpp
index c96d60a..8bb62ae 100644 (file)
--- a/src/qml/qml/v4/qv4engine.cpp
+++ b/src/qml/qml/v4/qv4engine.cpp
@@ -63,7 +63,7 @@
 #include "qv4debugging_p.h"
 #include "qv4executableallocator_p.h"
 #include "qv4sequenceobject_p.h"
-#include <private/qv8qobjectwrapper_p.h>
+#include "qv4qobjectwrapper_p.h"
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
 #include <execinfo.h>

diff --git a/src/qml/qml/v4/qv4mm.cpp b/src/qml/qml/v4/qv4mm.cpp
index e278637..b5e1544 100644 (file)
--- a/src/qml/qml/v4/qv4mm.cpp
+++ b/src/qml/qml/v4/qv4mm.cpp
@@ -43,8 +43,7 @@
 #include "qv4object_p.h"
 #include "qv4objectproto_p.h"
 #include "qv4mm_p.h"
-// ### FIXME: remove when qv8qobjectwrapper port is done.
-#include <private/qv8qobjectwrapper_p.h>
+#include "qv4qobjectwrapper_p.h"
 #include <qqmlengine.h>
 #include "PageAllocation.h"
 #include "StdLibExtras.h"

diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v4/qv4qobjectwrapper.cpp
similarity index 99%
rename from src/qml/qml/v8/qv8qobjectwrapper.cpp
rename to src/qml/qml/v4/qv4qobjectwrapper.cpp
index 27b4216..9d99954 100644 (file)
--- a/src/qml/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/qml/qml/v4/qv4qobjectwrapper.cpp
@@ -39,8 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qv8qobjectwrapper_p.h"
-#include "qv8engine_p.h"
+#include "qv4qobjectwrapper_p.h"
 
 #include <private/qqmlguard_p.h>
 #include <private/qqmlpropertycache_p.h>
@@ -55,6 +54,7 @@
 #include <private/qqmlvaluetypewrapper_p.h>
 #include <private/qqmlcontextwrapper_p.h>
 #include <private/qqmllistwrapper_p.h>
+#include <private/qv8engine_p.h>
 
 #include <private/qv4functionobject_p.h>
 #include <private/qv4runtime_p.h>

diff --git a/src/qml/qml/v8/qv8qobjectwrapper_p.h b/src/qml/qml/v4/qv4qobjectwrapper_p.h
similarity index 99%
rename from src/qml/qml/v8/qv8qobjectwrapper_p.h
rename to src/qml/qml/v4/qv4qobjectwrapper_p.h
index e00bed9..b231bd3 100644 (file)
--- a/src/qml/qml/v8/qv8qobjectwrapper_p.h
+++ b/src/qml/qml/v4/qv4qobjectwrapper_p.h
@@ -62,7 +62,6 @@
 #include <private/qqmldata_p.h>
 #include <private/qqmlpropertycache_p.h>
 #include <private/qintrusivelist_p.h>
-#include "qv8objectresource_p.h"
 
 #include <private/qv4value_p.h>
 #include <private/qv4functionobject_p.h>

diff --git a/src/qml/qml/v4/v4.pri b/src/qml/qml/v4/v4.pri
index a55f859..a65ad2a 100644 (file)
--- a/src/qml/qml/v4/v4.pri
+++ b/src/qml/qml/v4/v4.pri
@@ -53,7 +53,8 @@ SOURCES += \
     $$PWD/qv4v8.cpp \
     $$PWD/qv4executableallocator.cpp \
     $$PWD/qv4sequenceobject.cpp \
-    $$PWD/qv4include.cpp
+    $$PWD/qv4include.cpp \
+    $$PWD/qv4qobjectwrapper.cpp
 
 HEADERS += \
     $$PWD/qv4global_p.h \
@@ -105,7 +106,8 @@ HEADERS += \
     $$PWD/qv4util_p.h \
     $$PWD/qv4executableallocator_p.h \
     $$PWD/qv4sequenceobject_p.h \
-    $$PWD/qv4include_p.h
+    $$PWD/qv4include_p.h \
+    $$PWD/qv4qobjectwrapper_p.h
 
 OTHER_FILES += \
     $$PWD/v4classgen

diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index 84e0769..dbb88eb 100644 (file)
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -71,7 +71,7 @@
 #include <private/qqmlpropertycache_p.h>
 
 #include "qv8objectresource_p.h"
-#include "qv8qobjectwrapper_p.h"
+#include <private/qv4qobjectwrapper_p.h>
 #include <private/qv4value_p.h>
 #include <private/qv4object_p.h>
 

diff --git a/src/qml/qml/v8/v8.pri b/src/qml/qml/v8/v8.pri
index 073e2cf..1327792 100644 (file)
--- a/src/qml/qml/v8/v8.pri
+++ b/src/qml/qml/v8/v8.pri
@@ -5,7 +5,6 @@ HEADERS += \
     $$PWD/qv8debug_p.h \
     $$PWD/qv8profiler_p.h \
     $$PWD/qv8engine_p.h \
-    $$PWD/qv8qobjectwrapper_p.h \
     $$PWD/qv4domerrors_p.h \
     $$PWD/qv4sqlerrors_p.h \
     $$PWD/qqmlbuiltinfunctions_p.h \
@@ -13,7 +12,6 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/qv8engine.cpp \
-    $$PWD/qv8qobjectwrapper.cpp \
     $$PWD/qv4domerrors.cpp \
     $$PWD/qv4sqlerrors.cpp \
     $$PWD/qqmlbuiltinfunctions.cpp

diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h
index 7205155..4d30816 100644 (file)
--- a/tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/tests/auto/qml/qqmlecmascript/testtypes.h
@@ -63,7 +63,7 @@
 
 #include <private/qqmlengine_p.h>
 #include <private/qv8engine_p.h>
-#include <private/qv8qobjectwrapper_p.h>
+#include <private/qv4qobjectwrapper_p.h>
 
 class MyQmlAttachedObject : public QObject
 {