Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Mon, 11 May 2015 08:01:37 +0000 (10:01 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Mon, 11 May 2015 08:01:37 +0000 (10:01 +0200)
Change-Id: Ice083b71518d645bf411f1275826e928df797242


Trivial merge