diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
| commit | 1d333d3375874efb8d37df37dc5ef561573794ad (patch) | |
| tree | 2d8c995f64c05c84c1fcceb2c5cb40fcae69855f /src/qml/jsruntime/qv4enginebase_p.h | |
| parent | b106d86c433706928b0b0c206a0d9f831681e1bf (diff) | |
| parent | e79a2658cde899d6ee11ec3c0d0a3768eb2c864b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
Diffstat (limited to 'src/qml/jsruntime/qv4enginebase_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4enginebase_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h index 788897bdad..5e62c5bd50 100644 --- a/src/qml/jsruntime/qv4enginebase_p.h +++ b/src/qml/jsruntime/qv4enginebase_p.h @@ -86,7 +86,6 @@ struct Q_QML_EXPORT EngineBase { quint8 isExecutingInRegExpJIT = false; quint8 padding[3]; MemoryManager *memoryManager = nullptr; - Runtime runtime; qint32 callDepth = 0; Value *jsStackLimit = nullptr; @@ -146,7 +145,6 @@ Q_STATIC_ASSERT(offsetof(EngineBase, currentStackFrame) == 0); Q_STATIC_ASSERT(offsetof(EngineBase, jsStackTop) == offsetof(EngineBase, currentStackFrame) + QT_POINTER_SIZE); Q_STATIC_ASSERT(offsetof(EngineBase, hasException) == offsetof(EngineBase, jsStackTop) + QT_POINTER_SIZE); Q_STATIC_ASSERT(offsetof(EngineBase, memoryManager) == offsetof(EngineBase, hasException) + 8); -Q_STATIC_ASSERT(offsetof(EngineBase, runtime) == offsetof(EngineBase, memoryManager) + QT_POINTER_SIZE); Q_STATIC_ASSERT(offsetof(EngineBase, isInterrupted) + sizeof(EngineBase::isInterrupted) <= offsetof(EngineBase, hasException) + 4); } |