Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
authorYoann Lopes <yoann.lopes@theqtcompany.com>
Fri, 23 Jan 2015 11:22:50 +0000 (12:22 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 23 Jan 2015 11:22:50 +0000 (12:22 +0100)
commit2f494446388e314286506eae335439b7bbc75736
tree5b8e9ee8f8bb5ead36329017f0631489f70ea437
parentd07a22c8848fa2bf0088c961785c799cea49a833
parentaf2d5a181c3d48e04c2459d551f320cfd7186630
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev