Import fix from upstream.

Signed-off-by: Luca Niccoli <l.niccoli@awtech.it>
Fill empty list of files to patch for Qt5.

Signed-off-by: Luca Niccoli <l.niccoli@awtech.it>
Merge remote-tracking branch 'refs/remotes/origin/master'