diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-11-28 10:05:24 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-19 18:52:07 +0100 |
| commit | 05bf96997c52775f14cfd4e34d25187feec897e0 (patch) | |
| tree | dba1cb94f6a318d715343c75d54193bb170bb967 /src/qml/jsruntime/qv4engine_p.h | |
| parent | f9d4cd6fd75617b2bddde4ba591b77d1d6b4727b (diff) | |
Return Heap::ExecutionContext for globalContext()
Change-Id: Ide7c81735be4662ff45bf268cfe750ff1f784453
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4engine_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4engine_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index bb5d1c543b..03d471b5d3 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -78,8 +78,8 @@ public: Value *jsStackTop; quint32 hasException; - GlobalContext *m_rootContext; - GlobalContext *rootContext() const { return m_rootContext; } + Heap::GlobalContext *m_rootContext; + Heap::GlobalContext *rootContext() const { return m_rootContext; } MemoryManager *memoryManager; ExecutableAllocator *executableAllocator; @@ -270,7 +270,7 @@ public: void enableDebugger(); void enableProfiler(); - ExecutionContext *pushGlobalContext(); + Heap::ExecutionContext *pushGlobalContext(); void pushContext(CallContext *context); Heap::ExecutionContext *popContext(); |