Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 24 Dec 2013 09:30:20 +0000 (10:30 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 24 Dec 2013 09:30:20 +0000 (10:30 +0100)
commitd588ec795bf905d6d4a4827ad74f3d01315e40bf
tree67227f80379d77962602b758093251b593ee0c08
parent13e88fe2b9b1680cb161a249289c3ba998f08c0c
parentfdc18a5f25ba1c4cf35e1fa6f21272167bde36a9
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/quick/items/qquickrectangle.cpp

Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc
src/quick/items/qquickitem.cpp
src/quick/items/qquickitemview.cpp
src/quick/items/qquickitemview_p_p.h
src/quick/items/qquicklistview.cpp
src/quick/items/qquickmousearea.cpp
src/quick/items/qquickrectangle.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp