Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 14 Oct 2014 12:04:48 +0000 (14:04 +0200)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 14 Oct 2014 16:11:09 +0000 (18:11 +0200)
commitd67c04502f41a69bfee4ca3762643d2dc31e9a28
tree00bab498ec51a1bd7dd0fda309309d95415dc747
parentf97c03441b8c46ada314f47295ebff4e98bb646e
parent5a9f0131f8c0b7424a4d323b0f65237206be45ea
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
src/qml/jsruntime/qv4objectiterator.cpp
src/qml/jsruntime/qv4objectiterator_p.h
src/quick/scenegraph/qsgthreadedrenderloop.cpp

Change-Id: Ia54a9acd96530aa6683c228597af0ca25eadec4f
src/qml/jsruntime/qv4objectiterator.cpp
src/qml/jsruntime/qv4objectiterator_p.h
src/quick/scenegraph/qsgthreadedrenderloop.cpp