Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 15:44:57 +0000 (16:44 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 15:44:57 +0000 (16:44 +0100)
commite369af5feaaa769aacc8513301300df47babfbc2
tree80f1314106f32fe6aaedcdc61799d8e6d55371bf
parent1b8225028d3e18ed912f41944e7a60679e3a5142
parent030a9c9a0d00bf15ea632d956c9c84535774dfe7
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf

Change-Id: Ibbb51f63638ab198ebeae20bcc6fc7378378e1c4