diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-05-19 15:50:22 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-19 18:54:54 +0000 |
| commit | 8bc243f569e3feb1005fbca426bf24f59c38af2e (patch) | |
| tree | 3e69253b161432e4a02c3daa2de4ffbd2d9293f4 /src/qml/memory/qv4mm_p.h | |
| parent | 5bc38a50308665bdc185eb96dbcc9ba7948ab4e0 (diff) | |
Move the engine() accessor from Object to Managed
We can easily do this now that Managed has a pointer to an
internal class (which always has a back pointer to the
ExecutionEngine).
Remove the extra engine pointer from ExecutionContext, and clean
up tow methods in String.
Change-Id: I98d750b1afbdeadf42e66ae0c92c48db1a7adc31
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'src/qml/memory/qv4mm_p.h')
| -rw-r--r-- | src/qml/memory/qv4mm_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h index 69d3eeb93c..c5334a0dde 100644 --- a/src/qml/memory/qv4mm_p.h +++ b/src/qml/memory/qv4mm_p.h @@ -206,13 +206,13 @@ public: Q_DECL_CONSTEXPR static inline std::size_t align(std::size_t size) { return (size + Chunk::SlotSize - 1) & ~(Chunk::SlotSize - 1); } - QV4::Heap::CallContext *allocSimpleCallContext(QV4::ExecutionEngine *v4) + QV4::Heap::CallContext *allocSimpleCallContext() { Heap::CallContext *ctxt = stackAllocator.allocate(); memset(ctxt, 0, sizeof(Heap::CallContext)); ctxt->internalClass = CallContext::defaultInternalClass(engine); Q_ASSERT(ctxt->internalClass && ctxt->internalClass->vtable); - ctxt->init(v4); + ctxt->init(); return ctxt; } |