Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:22:51 +0000 (17:22 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 3 Mar 2015 18:31:04 +0000 (18:31 +0000)

Trivial merge