Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:17:46 +0000 (14:17 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:17:46 +0000 (14:17 +0200)
commit7224dd977163335d61ed4297341e6161bf1dbcf7
tree1674bfdd872ba45908437c9cbc67ba98f5f3b534
parentc704226b6815df4d989142729bae9fadd14f6f9d
parentf3973cbd077d2d92250958f8bda57fea30827f00
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I35f07a1725af104952f822274763dd7a96a9d560
src/quick/scenegraph/scenegraph.pri
src/quick/util/qquickimageprovider.cpp