Merge remote-tracking branch 'origin/5.5.0' into 5.5
authorLiang Qi <liang.qi@theqtcompany.com>
Fri, 26 Jun 2015 12:04:54 +0000 (14:04 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Fri, 26 Jun 2015 12:04:54 +0000 (14:04 +0200)
commit07333b7f1d7a6eb88534f3f309211468dab2002e
treea6659ef7c586c6f700a17fb93bb2a79a140a30ef
parent162334916bb87feaa6285f9916c87c541615da35
parente1b97bb31a685b1d98d26046c4129f2bf6903af0
Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: Idc7ad0119c9b37908fc432b31163a9b9e8f45734