aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qml/qml/qqmlcompileddata.cpp2
-rw-r--r--src/qml/qml/qqmlvme.cpp8
-rw-r--r--src/qml/qml/qqmlvme_p.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlcompileddata.cpp b/src/qml/qml/qqmlcompileddata.cpp
index 49f00944d5..c2ca079779 100644
--- a/src/qml/qml/qqmlcompileddata.cpp
+++ b/src/qml/qml/qqmlcompileddata.cpp
@@ -215,7 +215,7 @@ QQmlInstruction *QQmlCompiledData::instruction(int index)
QQmlInstruction::Type QQmlCompiledData::instructionType(const QQmlInstruction *instr)
{
#ifdef QML_THREADED_VME_INTERPRETER
- void **jumpTable = QQmlVME::instructionJumpTable();
+ void *const *jumpTable = QQmlVME::instructionJumpTable();
void *code = instr->common.code;
# define QML_CHECK_INSTR_CODE(I, FMT) \
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp
index 1f12af3102..9b550c5eaf 100644
--- a/src/qml/qml/qqmlvme.cpp
+++ b/src/qml/qml/qqmlvme.cpp
@@ -316,14 +316,14 @@ static QVariant variantFromString(const QString &string)
QObject *QQmlVME::run(QList<QQmlError> *errors,
const Interrupt &interrupt
#ifdef QML_THREADED_VME_INTERPRETER
- , void ***storeJumpTable
+ , void * const **storeJumpTable
#endif
)
{
#ifdef QML_THREADED_VME_INTERPRETER
if (storeJumpTable) {
#define QML_INSTR_ADDR(I, FMT) &&op_##I,
- static void *jumpTable[] = {
+ static void *const jumpTable[] = {
FOR_EACH_QML_INSTR(QML_INSTR_ADDR)
};
#undef QML_INSTR_ADDR
@@ -1263,9 +1263,9 @@ v8::Persistent<v8::Object> QQmlVME::run(QQmlContextData *parentCtxt, QQmlScriptD
}
#ifdef QML_THREADED_VME_INTERPRETER
-void **QQmlVME::instructionJumpTable()
+void *const *QQmlVME::instructionJumpTable()
{
- static void **jumpTable = 0;
+ static void * const *jumpTable = 0;
if (!jumpTable) {
QQmlVME dummy;
QQmlVME::Interrupt i;
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h
index 4d49b79259..ab9d1fa792 100644
--- a/src/qml/qml/qqmlvme_p.h
+++ b/src/qml/qml/qqmlvme_p.h
@@ -132,13 +132,13 @@ private:
QObject *run(QList<QQmlError> *errors, const Interrupt &
#ifdef QML_THREADED_VME_INTERPRETER
- , void ***storeJumpTable = 0
+ , void *const**storeJumpTable = 0
#endif
);
v8::Persistent<v8::Object> run(QQmlContextData *, QQmlScriptData *);
#ifdef QML_THREADED_VME_INTERPRETER
- static void **instructionJumpTable();
+ static void *const*instructionJumpTable();
friend class QQmlCompiledData;
#endif