Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Tue, 17 Mar 2015 15:39:43 +0000 (16:39 +0100)
committerLiang Qi <liang.qi@theqtcompany.com>
Tue, 17 Mar 2015 15:39:43 +0000 (16:39 +0100)
Change-Id: I9f4f561a6399b22c5f423dd853b07bffc9deebfc


Trivial merge