aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-12-18 19:45:28 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-08 12:32:23 +0000
commitd949d52383e92ba814e935ed2ef2135a1af9cd9b (patch)
tree6729586121613dd779b6b13c0670b508ebfd8991 /src/qml/qml
parent1688e951114417edd640fbb3d3cf25c2471a4f2b (diff)
Drop some dead code
Change-Id: Ia3d8adac5c1cd791b05b435ecb063f1b1304cdf3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/qml')
-rw-r--r--src/qml/qml/v8/qv8engine.cpp4
-rw-r--r--src/qml/qml/v8/qv8engine_p.h10
2 files changed, 0 insertions, 14 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index dadff819cf..2947f7870a 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -127,7 +127,6 @@ QV8Engine::QV8Engine(QJSEngine* qq)
: q(qq)
, m_engine(0)
, m_xmlHttpRequestData(0)
- , m_listModelData(0)
{
#ifdef Q_PROCESSOR_X86_32
if (!qCpuHasFeature(SSE2)) {
@@ -164,9 +163,6 @@ QV8Engine::~QV8Engine()
m_xmlHttpRequestData = 0;
#endif
- delete m_listModelData;
- m_listModelData = 0;
-
delete m_v4Engine;
}
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index a430fba0e6..98b182147c 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -77,12 +77,6 @@ namespace QV4 {
struct QObjectMethod;
}
-#define V4THROW_ERROR(string) \
- return ctx->engine()->throwError(QString::fromUtf8(string));
-
-#define V4THROW_TYPE(string) \
- return ctx->engine()->throwTypeError(QStringLiteral(string));
-
#define V4_DEFINE_EXTENSION(dataclass, datafunction) \
static inline dataclass *datafunction(QV4::ExecutionEngine *engine) \
{ \
@@ -183,9 +177,6 @@ public:
void *xmlHttpRequestData() const { return m_xmlHttpRequestData; }
- Deletable *listModelData() const { return m_listModelData; }
- void setListModelData(Deletable *d) { if (m_listModelData) delete m_listModelData; m_listModelData = d; }
-
void freezeObject(const QV4::Value &value);
#if QT_CONFIG(qml_network)
@@ -222,7 +213,6 @@ protected:
void *m_xmlHttpRequestData;
QVector<Deletable *> m_extensionData;
- Deletable *m_listModelData;
QSet<QString> m_illegalNames;