Merge remote-tracking branch 'origin/dev' into stable v5.3.0-alpha1
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Feb 2014 09:02:57 +0000 (10:02 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Feb 2014 09:02:57 +0000 (10:02 +0100)
commita104c706a4544fcab8f79c2783ff061826df0047
treef7c0260bc9e81e58099ace9f500048cbbc247950
parentb26b3e6c713b6f3b6f5b9b6a010763724c69b0ec
parentc0daf8bdf0e05244a1beaf45ebb831326aac5a57
Merge remote-tracking branch 'origin/dev' into stable

Conflicts:
.qmake.conf

Change-Id: I34952065d8370a34e68971d8506dfed385b649cb