Merge remote-tracking branch 'origin/5.4' into dev
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Wed, 14 Jan 2015 11:00:56 +0000 (12:00 +0100)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Fri, 16 Jan 2015 11:46:52 +0000 (12:46 +0100)
commit291aea14636a0e779d874a01630524facb1397dd
tree044ff4131a9b3f5a3edb00e6a807d0609c04a182
parent39f1e0d66dc434e764731fbfed29c8fd98d217aa
parent88e87647c3b7d651dba2c8e61f945d47ecdd02c4
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4debugging.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4functionobject_p.h
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/quick/scenegraph/shaders/visualization.frag
tests/auto/qml/qjsengine/tst_qjsengine.cpp

Change-Id: I492e8546c278f80a300a2129e9a29d861e144a30
19 files changed:
src/qml/compiler/qqmltypecompiler.cpp
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4context.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4dateobject.cpp
src/qml/jsruntime/qv4debugging.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4global_p.h
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/quick/items/context2d/qquickcontext2d.cpp
src/quick/items/qquicktext_p_p.h
src/quick/items/qquicktextedit.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/qsgwindowsrenderloop.cpp
src/quick/scenegraph/shaders/visualization.frag
tests/auto/qml/qjsengine/tst_qjsengine.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
tools/qmljs/qmljs.cpp