Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 8 Apr 2015 19:24:43 +0000 (21:24 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Wed, 8 Apr 2015 19:24:43 +0000 (21:24 +0200)
commit3059103201086b1187d3c6e8363e07f726929e32
tree3ea2bfe39916fcd09ff445309a43e09a32953de6
parentc1dbca5f109b34e8b3a58e241ff40a457e8e2dc6
parent63cff37741dca71f3db45ee06bc5bb06488c51f4
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I17ddd1ce77e07cf75567e2dc723e29d54088f68e