Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 16:05:21 +0000 (17:05 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 16:05:21 +0000 (17:05 +0100)
commit13e88fe2b9b1680cb161a249289c3ba998f08c0c
tree496a9d88c69b441e8c88aa0416b327faca3a1532
parenta2dad3ddee9c4bf274a7c6469342e4104605ceeb
parent470ba767663e4ad9d3183fb56ee89361354dfefb
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/quick/items/qquickitem.cpp
src/quick/items/qquicktext.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I0bc5786098193c2c40b6fd8905de75d90f6ed0cf
src/quick/items/context2d/qquickcanvasitem.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquickitem_p.h
src/quick/items/qquickitemview_p.h
src/quick/items/qquicklistview.cpp
src/quick/items/qquickmousearea.cpp
src/quick/items/qquicktext.cpp
src/quick/items/qquickwindow.cpp
tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp