Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Aug 2014 09:37:06 +0000 (11:37 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 14 Aug 2014 09:37:06 +0000 (11:37 +0200)
commit12a4ef62869458f7d0dde107c24f93c8d180060c
treeeb98429ea053c5477cc563b1613d1cea7c42b46f
parentcbd5ed0e0dc459ece096aa43d775f64d6efd63b5
parent809b5e2fc1cc5935c2dd7d63992c7a94dfce4dd8
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4