Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 8 Apr 2015 19:25:08 +0000 (21:25 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Wed, 8 Apr 2015 19:25:08 +0000 (21:25 +0200)
Change-Id: Ia0594c63ea035a715b163395027178b2ea2752ed


Trivial merge