Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 21:27:43 +0000 (21:27 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 10 Feb 2015 21:27:43 +0000 (21:27 +0000)
commit5bb19648f1a9009697253a8038a3cd2216d7b936
treeface25989bf38dcc8fdc202ae821e7322608640c
parentfd395141f00ef0fc72e2d6b7da0c6397324036a3
parent628c5e571abb3715f404ca46a9df82c4f97873a0
Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4