Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 12:08:08 +0000 (12:08 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 17 Mar 2015 13:06:23 +0000 (13:06 +0000)

Trivial merge