Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 15:12:40 +0000 (16:12 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 15:12:41 +0000 (16:12 +0100)
commit24e2b39e7a06687322a18a158a083eb51a7c0dca
tree1a32caf6dd6db74fbac9553a094bb00b216fa678
parent39540124dd0900e0c99dcda8c0ebdf4f3cea8d5e
parentdaff5f2988cef31442629a48c3b3088abf01837a
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
src/qml/qml/qqmlcompiler.cpp
src/quick/items/context2d/qquickcanvasitem.cpp
src/quick/items/qquickgridview.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquicklistview.cpp
src/quick/items/qquickwindow.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp