Merge remote-tracking branch 'origin/5.4' into 5.5
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Mon, 4 May 2015 08:20:20 +0000 (10:20 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Mon, 4 May 2015 08:20:49 +0000 (10:20 +0200)
commit1648c166dbb541bbe663f3d6e5ad2a39d0735aea
tree099a31921aa2f9ab605fb1d8c3ffcaa030f75793
parent6c1d99c2490e1af5c42d03cf10e8fe4d2e30c025
parent2fdb6eba0a58b629db32f9eefec2f26df08d3d2e
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ie8ea118ed0a1a9a1c3d81e1e34d85c03c695c9a4
src/qml/compiler/qv4codegen.cpp
src/quick/items/qquickscreen.cpp
tests/auto/qml/qjsengine/tst_qjsengine.cpp