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

Change-Id: I0390795fa3d5f2a7ba098b514ee2da4a86e243a6