[mingw-qt5-qtbase/f19: 5/5] Merge branch 'master' into f19

[Erik van Pienbroek]

commit 2d02462c3705a5e97501aa5e164dea2ddaed8b05
Merge: 3dcf446 6c4afda
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Jul 6 11:43:52 2014 +0200

    Merge branch 'master' into f19

 .gitignore                             |    1 +
 mingw-qt5-qtbase.spec                  |   17 +++++++++++++----
 qt5-enable-rpath-for-host-tools.patch  |    4 ++--
 qt5-rename-qtmain-to-qt5main.patch     |    8 ++++----
 qt5-use-system-zlib-in-host-libs.patch |    6 +++---
 sources                                |    2 +-
 6 files changed, 24 insertions(+), 14 deletions(-)
---