Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Tue, 18 Aug 2015 11:21:13 +0000 (11:21 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 18 Aug 2015 11:21:13 +0000 (11:21 +0000)
commita820a56eb5a8e4f21ca4a04efe816e40b5645cef
treef86da404570600859efd24a4b942c2c68bca95c3
parentf245fc543c479cbc69be886c5d04d4738b491060
parenteb30e3d7ee81c48cea720e7ecd2ed45647bc70ee
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6