Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 20 Aug 2013 14:54:29 +0000 (16:54 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Tue, 20 Aug 2013 14:54:29 +0000 (16:54 +0200)
commit461892e492e0bef399714557498380703b3e029b
treead82e1ae8286bbe650b2ee19ad393a4ab8996bb1
parenta71e35a95c9f352db91fb82d8a564d01ba961341
parent90aaff37be419ca1f1da40df64424c0d88bfaf19
Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative into dev

Conflicts:
src/qml/compiler/qv4codegen.cpp
src/qml/compiler/qv4codegen_p.h
src/qml/compiler/qv4isel_moth.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4functionobject.cpp
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4runtime_p.h
src/qml/jsruntime/qv4script.cpp
sync.profile

Change-Id: I1d785e2134bffac9553a1c16eed12816cbd1ad2c
22 files changed:
src/qml/compiler/compiler.pri
src/qml/compiler/qv4codegen.cpp
src/qml/compiler/qv4codegen_p.h
src/qml/compiler/qv4instr_moth_p.h
src/qml/compiler/qv4isel_masm.cpp
src/qml/compiler/qv4isel_masm_p.h
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4isel_moth_p.h
src/qml/compiler/qv4isel_p.cpp
src/qml/compiler/qv4isel_p.h
src/qml/compiler/qv4jsir.cpp
src/qml/compiler/qv4jsir_p.h
src/qml/jsruntime/qv4context.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4engine_p.h
src/qml/jsruntime/qv4functionobject.cpp
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4runtime_p.h
src/qml/jsruntime/qv4script.cpp
src/qml/jsruntime/qv4vme_moth.cpp
tools/v4/main.cpp