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)
commita1922317f8b2c219176553ff3f0db815f6f16cfd
treef90b3725afcfdd5efce59ad698bd1b347f26900e
parent02bf3ca59ea1aa4af0ce39d2f4fc856ce47f9966
parentffe861a0785056a90c787172400fa6061acfcc32
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I59f34fafd795694981dd1edffca1d322657f1ae6
src/qml/qml/qqmlengine.cpp
src/quick/items/context2d/qquickcontext2d.cpp