Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 10:59:04 +0000 (12:59 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 10:59:04 +0000 (12:59 +0200)
Change-Id: I59f34fafd795694981dd1edffca1d322657f1ae6

1  2 
src/qml/qml/qqmlengine.cpp
src/quick/items/context2d/qquickcontext2d.cpp

Simple merge