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)
1  2 
src/qml/qml/qqmlengine.cpp

Simple merge