Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Mon, 29 Jun 2015 18:12:41 +0000 (20:12 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Mon, 29 Jun 2015 18:12:41 +0000 (20:12 +0200)
commiteeeaf56e1ed300dd86040b976d278434387070c1
treeddfb5aaf66351fd5b224cca5da72475b6a7f1714
parentd56636976643498b9fa688eb9b3029ed9669a8a2
parente863246ebd58192d202933a9f32b57fd811dc9ea
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
.qmake.conf

Change-Id: I2424cf97743b3f998bf7b10a21f8075ed76b613f