Merge remote-tracking branch 'origin/5.4' into 5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:21:56 +0000 (18:21 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:21:56 +0000 (18:21 +0100)
commitd8c559c4e2fc0b8051be78bd64b8a8fe80b3b78f
tree8af3738bb802fb064cb81352818a172b7c24e21a
parent4d8b9373c62b9b58c54548f41f1e9d84e9522c6e
parentc3effc6cd3a66b6c02048d8ad85c7ed3bb3c1463
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
src/qml/jsruntime/qv4numberobject.cpp

Change-Id: I4e66a03ef4d99cec192c9da30c028fd8c1f4ac0d
src/qml/jsruntime/qv4numberobject.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
src/quick/scenegraph/qsgthreadedrenderloop_p.h
tests/auto/qml/qjsengine/tst_qjsengine.cpp