Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 21:11:05 +0000 (23:11 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 28 Aug 2014 21:11:05 +0000 (23:11 +0200)

Trivial merge