Merge remote-tracking branch 'origin/5.4' into dev
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Fri, 31 Oct 2014 19:20:43 +0000 (20:20 +0100)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Fri, 31 Oct 2014 19:21:09 +0000 (20:21 +0100)
commit473ef83dba6976250a1ff27175716aa1af970f2f
tree922044c8be598f76945af1599196c7f379df280e
parentbeb6667d4e65dfe2ec9e7f554837524416c0f4dc
parent0704d2be63b484cb579c1507223db3f914b1338a
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I30f9c925631991ceb22339d1333936faecffbaf4
src/qml/jsruntime/qv4managed_p.h
src/qml/qml/qqmlxmlhttprequest.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquicktextedit_p_p.h
tests/auto/quick/qquickgridview/tst_qquickgridview.cpp