diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-06-11 16:17:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-11 16:29:13 +0200 |
| commit | 0448b57eeda7f2c79cddd7d9d43a772737183dc1 (patch) | |
| tree | 10741858a790c78daca837b8696fe4d6fa565121 | |
| parent | d338d1ef4249602d3df8facb927d46af029703b8 (diff) | |
Remove unused stuff from qv8objectresource.
Change-Id: Idb24297ff2b518cc3d928c0cf01ee9feb8223eee
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 1 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8objectresource_p.h | 3 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index c24f36d0f2..1a70352ff9 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -142,7 +142,6 @@ QVariant QV8Engine::toVariant(const QV4::Value &value, int typeHint) QV8ObjectResource *r = (QV8ObjectResource *)v8::Handle<v8::Value>(value)->ToObject()->GetExternalResource(); if (r) { switch (r->resourceType()) { - case QV8ObjectResource::Context2DStyleType: case QV8ObjectResource::XMLHttpRequestType: case QV8ObjectResource::DOMNodeType: case QV8ObjectResource::ParticleDataType: diff --git a/src/qml/qml/v8/qv8objectresource_p.h b/src/qml/qml/v8/qv8objectresource_p.h index 5afecb2e4f..aa876ae2b6 100644 --- a/src/qml/qml/v8/qv8objectresource_p.h +++ b/src/qml/qml/v8/qv8objectresource_p.h @@ -70,8 +70,7 @@ class QV8ObjectResource : public v8::Object::ExternalResource public: QV8ObjectResource(QV8Engine *engine) : engine(engine) { Q_ASSERT(engine); } enum ResourceType { XMLHttpRequestType, DOMNodeType, - Context2DStyleType, - ParticleDataType, VisualDataItemType }; + ParticleDataType }; virtual ResourceType resourceType() const = 0; QV8Engine *engine; diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 9b0e1ad6fb..6b43266e76 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -69,8 +69,6 @@ #include <private/qv4functionobject_p.h> #include <private/qv4objectproto_p.h> -#include <private/qv8objectresource_p.h> - #if defined(Q_OS_QNX) || defined(Q_OS_ANDROID) #include <ctype.h> #endif |