Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 26 Jun 2014 15:25:12 +0000 (17:25 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 26 Jun 2014 15:25:12 +0000 (17:25 +0200)
commitdfd00bca7e5fef31a1ab1a01ef75a0718804474b
treef4e8ba1b737ddac78227d0697a433a25c4341fcc
parent310402c6c183bcf24b01fac73f53cc7b9a2746c4
parent1d73904b252d724dbd9a50cc047356e171abdcea
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf

Change-Id: Ic2b4c2bf7b985c97d75d70980413da4f569f207a