Merge branch 'qt_gamescene'