Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 16 Sep 2014 13:29:38 +0000 (15:29 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 16 Sep 2014 13:29:38 +0000 (15:29 +0200)
commit7d02c5e2e9329ef8075d965ce675515345b24dab
tree7671c00279af138049e0b370cf474db825549086
parentc19d0217a515561bff8003e35ad233e27c16abf9
parentf5f5057937e0a66229368a71a619c45043c04727
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
.qmake.conf

Change-Id: I32718899f94175b7012ac5ba208fc18eb54b3ae9
src/macdeployqt/shared/shared.cpp