diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:21:42 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:29:17 +0200 |
commit | bbb78a92a910d32b2886af62c218db87325eb6ce (patch) | |
tree | 0e4b55352bb9f083826d0e80747982823f2894ed /src/qml/jsruntime/qv4function_p.h | |
parent | 4b5a7b15fc6d3650c8e9b7bf619804a0a953eeba (diff) | |
parent | 8ed38c70fd29680f7981d9d23581d46cf32139d0 (diff) |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into HEAD
Conflicts:
src/qml/compiler/qv4isel_masm.cpp
src/qml/jsruntime/qv4script.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmltypeloader_p.h
Change-Id: Ia784d855a2131e3289454f12d841ca2c65be15c1
Diffstat (limited to 'src/qml/jsruntime/qv4function_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4function_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h index 1fc40d7209..b93eded3f3 100644 --- a/src/qml/jsruntime/qv4function_p.h +++ b/src/qml/jsruntime/qv4function_p.h @@ -85,7 +85,7 @@ struct Function { const CompiledData::Function *compiledFunction; CompiledData::CompilationUnit *compilationUnit; - inline Value code(ExecutionContext *ctx, const uchar *data) { + inline ReturnedValue code(ExecutionContext *ctx, const uchar *data) { Value *stack = ctx->engine->jsStackTop; try { return codePtr(ctx, data); @@ -95,7 +95,7 @@ struct Function { } } - Value (*codePtr)(ExecutionContext *, const uchar *); + ReturnedValue (*codePtr)(ExecutionContext *, const uchar *); const uchar *codeData; quint32 codeSize; @@ -103,7 +103,7 @@ struct Function { QVector<String *> locals; Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function, - Value (*codePtr)(ExecutionContext *, const uchar *), quint32 _codeSize); + ReturnedValue (*codePtr)(ExecutionContext *, const uchar *), quint32 _codeSize); ~Function(); inline QString sourceFile() const { return compilationUnit->fileName(); } |