Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Thu, 16 Oct 2014 10:13:13 +0000 (12:13 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 16 Oct 2014 10:13:13 +0000 (12:13 +0200)
commita5de067d8ecd27edb993ca3b9212275970180555
tree895909f5136bc7bcf9ce8db91e83b390bb54f2c0
parent65dd5ce869b1c46c70e711c59b061d8e3eb84d88
parente69d4a9fd917d332c490a50e98b9802183afc478
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4