Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Sun, 22 Feb 2015 15:09:45 +0000 (15:09 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sun, 22 Feb 2015 15:09:45 +0000 (15:09 +0000)

Trivial merge