Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 18 Aug 2014 15:49:20 +0000 (17:49 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 18 Aug 2014 15:49:21 +0000 (17:49 +0200)
commit2a14494f7f4181a4d2619ff9afd992ac0a9f78f9
treec22307b1f6c47fabfa6d4723be554856487b688d
parent60da4c85f8cec926272d59069b0232fdb27855ce
parent082f74efa1f1f89467380ad5229bd84325ee3767
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4