diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:26 +0100 |
| commit | ff466a1881435f927f5df9ce1e5eac07d5591904 (patch) | |
| tree | 760e068743e6a8e1cc4ec63bb2f8e7dcef88b3e2 /src/qml/jsruntime/qv4context_p.h | |
| parent | e04822f3c2a6b69b7d75e2039256aa2433c59dd2 (diff) | |
| parent | 4a3f6e58b591f2fe2204f7cbc1efc8abb0aade74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4globalobject.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/quick/items/qquicktext_p.h
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput_p.h
Change-Id: If07e483e03197cb997ef47a9c647a479cdb09f4c
Diffstat (limited to 'src/qml/jsruntime/qv4context_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4context_p.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h index 7057e94457..bb45bf4b7d 100644 --- a/src/qml/jsruntime/qv4context_p.h +++ b/src/qml/jsruntime/qv4context_p.h @@ -62,11 +62,6 @@ struct ExecutionContext : Base { Type_CallContext = 0x5, Type_QmlContext = 0x6 }; - struct EvalCode - { - Function *function; - EvalCode *next; - }; inline ExecutionContext(ExecutionEngine *engine, ContextType t); @@ -80,7 +75,6 @@ struct ExecutionContext : Base { ExecutionContext *outer; Lookup *lookups; CompiledData::CompilationUnit *compilationUnit; - EvalCode *currentEvalCode; int lineNumber; @@ -158,7 +152,6 @@ Heap::ExecutionContext::ExecutionContext(ExecutionEngine *engine, ContextType t) , outer(0) , lookups(0) , compilationUnit(0) - , currentEvalCode(0) , lineNumber(-1) { // ### GC @@ -216,7 +209,6 @@ inline void ExecutionEngine::pushContext(CallContext *context) Q_ASSERT(current && current->d() && context && context->d()); context->d()->parent = current->d(); current = context; - current->d()->currentEvalCode = 0; } inline ExecutionContext *ExecutionEngine::popContext() |