aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qml/qml/qqmlcontextwrapper.cpp2
-rw-r--r--src/qml/qml/v8/qv8engine.cpp1
-rw-r--r--src/qml/qml/v8/qv8engine_p.h4
-rw-r--r--src/qml/qml/v8/qv8qobjectwrapper.cpp18
-rw-r--r--src/qml/qml/v8/qv8qobjectwrapper_p.h17
5 files changed, 0 insertions, 42 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp
index a9ff7a2b3c..592472e3c1 100644
--- a/src/qml/qml/qqmlcontextwrapper.cpp
+++ b/src/qml/qml/qqmlcontextwrapper.cpp
@@ -286,8 +286,6 @@ void QmlContextWrapper::put(Managed *m, ExecutionContext *ctx, String *name, con
QHashedV4String propertystring(Value::fromString(name));
- QV8QObjectWrapper *qobjectWrapper = engine->qobjectWrapper();
-
while (context) {
// Search context properties
if (context->propertyNames && -1 != context->propertyNames->value(propertystring))
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 4a25ddb5cb..469f380ec5 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -101,7 +101,6 @@ QV8Engine::QV8Engine(QJSEngine* qq)
m_v4Engine->v8Engine = this;
QV4::QObjectWrapper::initializeBindings(m_v4Engine);
- m_qobjectWrapper.init(this);
}
QV8Engine::~QV8Engine()
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index de64af1b6d..84e0769a20 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -242,8 +242,6 @@ public:
QJSEngine *publicEngine() { return q; }
QV4::Value global();
- QV8QObjectWrapper *qobjectWrapper() { return &m_qobjectWrapper; }
-
void *xmlHttpRequestData() { return m_xmlHttpRequestData; }
Deletable *listModelData() { return m_listModelData; }
@@ -310,8 +308,6 @@ protected:
QV4::ExecutionEngine *m_v4Engine;
- QV8QObjectWrapper m_qobjectWrapper;
-
QV4::PersistentValue m_freezeObject;
void *m_xmlHttpRequestData;
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp
index 29d3524e41..d13c9c36bf 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp
@@ -963,24 +963,6 @@ private:
};
}
-QV8QObjectWrapper::QV8QObjectWrapper()
-: m_engine(0)
-{
-}
-
-QV8QObjectWrapper::~QV8QObjectWrapper()
-{
-}
-
-void QV8QObjectWrapper::destroy()
-{
-}
-
-void QV8QObjectWrapper::init(QV8Engine *engine)
-{
- m_engine = engine;
-}
-
namespace {
struct CallArgs
{
diff --git a/src/qml/qml/v8/qv8qobjectwrapper_p.h b/src/qml/qml/v8/qv8qobjectwrapper_p.h
index 979def3575..e00bed9d9b 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper_p.h
+++ b/src/qml/qml/v8/qv8qobjectwrapper_p.h
@@ -197,23 +197,6 @@ private slots:
}
-class Q_QML_PRIVATE_EXPORT QV8QObjectWrapper
-{
-public:
- QV8QObjectWrapper();
- ~QV8QObjectWrapper();
-
- void init(QV8Engine *);
- void destroy();
-
-private:
- friend class QQmlPropertyCache;
- friend struct QV4::QObjectWrapper;
- friend struct QV4::QObjectSlotDispatcher;
-
- QV8Engine *m_engine;
-};
-
QT_END_NAMESPACE
#endif // QV8QOBJECTWRAPPER_P_H