Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Fri, 28 Aug 2015 04:57:18 +0000 (04:57 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 28 Aug 2015 04:57:18 +0000 (04:57 +0000)
commit7cf223c6db1fe3d2f4d58df955973426f69b58a8
treedc7bef6113c30c2e6dffa0b40280d950c4a4252c
parent1faca908dddb90824d94bed6a1561f4f192328d3
parent4a1846acd122af58c601f9832ade4c4d8986e66a
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6