Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 3 May 2013 20:32:05 +0000 (22:32 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 3 May 2013 21:42:26 +0000 (23:42 +0200)
commit22fc92cf9187460785a05e31620823fe8afe5eab
tree2de1b4ccece44bac25d5689012fe7c436973b57b
parenteddd6b8571eec6ab91174084eeb235d38589ca59
parent7224dd977163335d61ed4297341e6161bf1dbcf7
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
src/qml/qml/qqmlengine.cpp