Merge remote-tracking branch 'origin/5.5.0' into 5.5
authorLiang Qi <liang.qi@theqtcompany.com>
Fri, 26 Jun 2015 12:03:55 +0000 (14:03 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Fri, 26 Jun 2015 12:03:56 +0000 (14:03 +0200)
commit1c1bb3bc4ae3907d9d6d2417b56d90da3c70e4b7
treeea7c3a0dbf98786edf0a2be0f82381e0f25bac61
parent7ccfa59664b8bdb24c06025d3ffc5c4da7f0bb1e
parentb1ccb1f8c30d601c55145b65add3846fe5f9bb32
Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: I4020a1b3c59dea18faf7cbcbb78b90fcfc3680f0