Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 16 Sep 2014 13:29:54 +0000 (15:29 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 16 Sep 2014 13:29:54 +0000 (15:29 +0200)
commit4301d626f8e6e2dabf3a71205eb632f001827a7f
treec1059d5d5877a72e4b1816d587ce798bd74d5dab
parentea22c846b285ee4f71efc0fc050a4759880433a8
parentc98ca1256d40a59612b31c78c3e4f2f01e1b861f
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
.qmake.conf

Change-Id: Ib38d0c86aa010b06b9a201115dfbc9f091abeb0e