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)

Trivial merge