Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorYoann Lopes <yoann.lopes@digia.com>
Mon, 1 Sep 2014 12:19:53 +0000 (14:19 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 1 Sep 2014 12:19:53 +0000 (14:19 +0200)
commitbc1fa076c944c6af3250cb7210190da42a4de6ea
treeb6948fa95abbdd4ffbb30b76c7d3c09ae07e51db
parent0c3438c9a12fbc607eada8f938cf0ad8fdea374d
parent659f238bbbe040cce1bdf900f8f5500845ca8727
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4