[mingw-qt5-qtbase/epel7: 3/3] Merge branch 'master' into epel7

[Erik van Pienbroek]

commit 656a1b6d50f4c3801a731b4e798d3114780a4462
Merge: 2916204 2f59f0f
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Dec 31 01:08:14 2014 +0100

    Merge branch 'master' into epel7

 .gitignore                                       |    1 +
 mingw-qt5-qtbase.spec                            |   30 ++++--
 qt5-add-angle-support.patch                      |   22 ++--
 qt5-qtbase-fix-linking-against-static-pcre.patch |    4 +-
 qt5-use-external-angle-library.patch             |  119 ++++++++++++----------
 qt5-use-win32-g++-mkspecs-profile.patch          |    4 +-
 qt5-workaround-pkgconfig-install-issue.patch     |    4 +-
 sources                                          |    2 +-
 8 files changed, 104 insertions(+), 82 deletions(-)
---