Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 1 Apr 2015 06:59:17 +0000 (06:59 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 1 Apr 2015 06:59:17 +0000 (06:59 +0000)

Trivial merge