Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:19:05 +0000 (16:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:19:05 +0000 (16:19 +0200)
commit2402d3a303f712f4402cc258fcd7c8983227ea31
tree3e79afdfd1e4268adecf4ad98bb867025048bd61
parent1037a7f7123dcf9f7b48a6a74118f746ddcbf3d5
parent5d4b006181d009e6245d5d38c7798603ddcab06a
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5cc2cacd26004ba18f0c6214759f5e073b5c6cfb
src/qml/qml/qqmlengine.cpp