Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 18 Feb 2013 15:07:54 +0000 (16:07 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 18 Feb 2013 15:07:55 +0000 (16:07 +0100)
Change-Id: I33db683ebf12248b2ed14eeaf65c4bcade14bfbf

1  2 
src/quick/designer/designersupport.cpp
src/quick/items/qquickrepeater.cpp
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/util/qsgpainternode.cpp

Simple merge
Simple merge