Merge remote-tracking branch 'origin/5.4' into dev
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Wed, 5 Nov 2014 06:04:07 +0000 (22:04 -0800)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Wed, 5 Nov 2014 06:04:19 +0000 (22:04 -0800)
commit4876c2aa95a58dd9dd17e94e7e725ceea5047d26
tree845a407efe5df39d97805fd2f006f5c056ac336f
parent878b11e0a94e892c0377bca01b49706c150926ed
parent25b6fae1eb26645a30b3e7e254ce0b585757351c
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
src/qml/jsruntime/qv4errorobject_p.h

Change-Id: I7fc1211295738a9fae32b783a9f001f1613785e4
src/qml/jsruntime/qv4errorobject_p.h
src/qml/jsruntime/qv4sequenceobject.cpp
src/qml/qml/qqmllocale_p.h
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp