Merge remote-tracking branch 'origin/5.4.0' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Thu, 27 Nov 2014 17:04:59 +0000 (18:04 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Thu, 27 Nov 2014 17:04:59 +0000 (18:04 +0100)
commit016ce1d46c6ebb29e9b8a9d7667876d9bb1c37bc
treeeebe9835419f3ecc5d6b168f42fbf2b4b134d98a
parent7e7d549d26028ff407a9a3d260955f95b403a406
parent5060a0ec7dcb26826b19eefbd6063efcbde6101f
Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: Icb5b56853c52d51d2cbb294ce9abb5450e2fa2d4