Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Mon, 29 Dec 2014 15:18:07 +0000 (16:18 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 29 Dec 2014 15:18:07 +0000 (16:18 +0100)
commit3081a0182457fef868c5f1f94eef0a77c4144995
treeafaa0be0ad98e8bef0ac396a91818bf95a177929
parent9eb989dee3b7add23d83f2d0c40b2843f6a832a7
parentd361631fbd3f45ba32e867e165253245f9024837
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev