Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Thu, 23 Jul 2015 16:59:48 +0000 (16:59 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 23 Jul 2015 16:59:48 +0000 (16:59 +0000)
commitbd452c3d25778dc646b8f0aff70fa6a8c7e0ebcc
tree9266960d7017bb3dc9e29abe7e7337228f936387
parent40b9fb8946837a01710814c28fd0f04edba631ad
parent5931caca23709ed0b2583ca2fd268191d06a23ef
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5