Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 25 Jun 2013 21:26:42 +0000 (23:26 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 25 Jun 2013 21:26:56 +0000 (23:26 +0200)
commitc0f6bdd39501aff887b39954122f74fb1e9bdc6c
tree7189cea236b2a9a37498d65ae89b92c494b59649
parentac06540d7aa0df2f6ceea0b82db724a2216d1b8c
parenta4754a30abc6f650885cbd20d0419da26a504220
Merge remote-tracking branch 'origin/release' into stable

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