aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2011-09-28 15:27:48 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-29 09:51:09 +0200
commit07020f1cffbd1effa800a599f6c389e8f60c9e8d (patch)
tree6146ff2efaafe0e847a1a95fa2b90a7c06320521 /src
parentdc2935cbb0852c23804d894bef0e2a56b343b089 (diff)
Fix compile of the non-threaded V4 interpreter.
Change-Id: I263e9826c513f8edaaf510ff1206b588dfe92f7b Reviewed-on: http://codereview.qt-project.org/5725 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/v4/qdeclarativev4instruction.cpp2
-rw-r--r--src/declarative/qml/v4/qdeclarativev4instruction_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/v4/qdeclarativev4instruction.cpp b/src/declarative/qml/v4/qdeclarativev4instruction.cpp
index 6ae28f91da..e9556d6816 100644
--- a/src/declarative/qml/v4/qdeclarativev4instruction.cpp
+++ b/src/declarative/qml/v4/qdeclarativev4instruction.cpp
@@ -362,7 +362,7 @@ V4Instr::Type Bytecode::instructionType(const V4Instr *instr) const
return static_cast<V4Instr::Type>(0);
# undef CHECK_V4_INSTR_CODE
#else
- return static_cast<V4Instr::Type>(instr.common.type);
+ return static_cast<V4Instr::Type>(instr->common.type);
#endif
}
diff --git a/src/declarative/qml/v4/qdeclarativev4instruction_p.h b/src/declarative/qml/v4/qdeclarativev4instruction_p.h
index 46336b4b75..3a125f771b 100644
--- a/src/declarative/qml/v4/qdeclarativev4instruction_p.h
+++ b/src/declarative/qml/v4/qdeclarativev4instruction_p.h
@@ -161,7 +161,7 @@ QT_BEGIN_NAMESPACE
# define QML_V4_END_INSTR(I,FMT) code += QML_V4_INSTR_SIZE(I, FMT); instr = (const V4Instr *) code; goto *instr->common.code;
# define QML_V4_INSTR_HEADER void *code;
#else
-# define QML_V4_BEGIN_INSTR(I,FMT) case Instr::I:
+# define QML_V4_BEGIN_INSTR(I,FMT) case V4Instr::I:
# define QML_V4_END_INSTR(I,FMT) code += QML_V4_INSTR_SIZE(I, FMT); instr = (const V4Instr *) code; break;
# define QML_V4_INSTR_HEADER quint8 type;
#endif