Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Tue, 17 Mar 2015 15:40:27 +0000 (16:40 +0100)
committerLiang Qi <liang.qi@theqtcompany.com>
Tue, 17 Mar 2015 15:40:28 +0000 (16:40 +0100)
commitc1dbca5f109b34e8b3a58e241ff40a457e8e2dc6
tree606df3fc92db69e1b9125409e53f84000428567a
parent7dfcc372cb83e2c666f97a5e33f577d5cda9c63b
parent64b75cc1d7ab1c3a557c809e15154d5d3a03d1ad
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ic09d6310fcb6d8198b6ec2dc0459c1694e9df8c9