Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 13 Feb 2015 12:12:00 +0000 (13:12 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 13 Feb 2015 12:12:00 +0000 (13:12 +0100)
commitc8109fdac1c66816bf72551b886f03f05a20da0e
tree2d1ba945ef6b505763026f089a3c7c05c8a754f6
parentcf82978ac02114a9e0ea164443c0bb396fc7db0f
parentaa69d43037f9dd612af400ff662e0004b1d4d9dd
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf

Change-Id: I34c07ac0a2c0c01501f0cd095542e266ef456607