Merge remote-tracking branch 'origin/5.3' into 5.4
authorSimon Hausmann <simon.hausmann@digia.com>
Mon, 8 Sep 2014 11:10:21 +0000 (13:10 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Mon, 8 Sep 2014 11:10:21 +0000 (13:10 +0200)
commit38fe461e2cc4bf3aebcb98d25c643bfe6653120a
treeb625415f33791ce0202538396509379fd04b111a
parentf9ee33f9683a4cd4d1a2e41efa6e8d124e9d731d
parentf7c3035fa1d965dceb36892122683a5ceb6cab89
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
.qmake.conf
src/qml/jsruntime/qv4arraydata.cpp
src/quick/scenegraph/util/qsgatlastexture.cpp

Change-Id: Ic4c96066d5c37dcf0d5446baed590ea005d445ce
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4script.cpp
src/quick/scenegraph/util/qsgatlastexture.cpp
src/quick/util/qquickanimatorcontroller.cpp
src/quick/util/qquickanimatorjob.cpp
src/quick/util/qquickanimatorjob_p.h
tests/auto/qml/qjsengine/tst_qjsengine.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp