Merged patches from the official qtbase/stable branch, not part of 5.2.1. Signed-off-by: Peter Kümmel <syntheticpp@gmx.net> Acked-by: Fatih Aşıcı <fatih.asici@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>