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)
Change-Id: I35f07a1725af104952f822274763dd7a96a9d560

1  2 
src/quick/scenegraph/scenegraph.pri
src/quick/util/qquickimageprovider.cpp

Simple merge