Merge branch 'master' of github.com:xuqi1987/Qt