Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 21:11:05 +0000 (23:11 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 28 Aug 2014 21:11:05 +0000 (23:11 +0200)
commit23fb6df3edcf0d4f3370f48ed1f69b77ae5dd03b
treec939559ed20e009eae564c22fb5449477d6eae87
parente64b6245a91a9d2bd269452c772c7c6eea784b39
parent06c2ddc88c6d7b0cf4d90b0c373462a06a1e7b1c
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4