Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0
authorJani Heikkinen <jani.heikkinen@theqtcompany.com>
Mon, 10 Nov 2014 15:06:02 +0000 (16:06 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 10 Nov 2014 15:06:02 +0000 (16:06 +0100)

Trivial merge