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

[Erik van Pienbroek]

commit 3dcf4461ae3916c815c1842f3e0b6abe6f919abe
Merge: bc365ad af531a4
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat May 24 20:12:07 2014 +0200

    Merge branch 'master' into f19

 .gitignore                                      |    1 +
 mingw-qt5-qtbase.spec                           |   19 ++++-------
 qt5-add-angle-support.patch                     |   12 +++---
 qt5-merge-static-and-shared-library-trees.patch |    4 +-
 qt5-qmake-implib-dll-a.patch                    |    4 +-
 qt5-rename-qtmain-to-qt5main.patch              |    8 ++--
 qt5-use-external-angle-library.patch            |   38 +++++++++++-----------
 qt5-use-system-zlib-in-host-libs.patch          |    4 +-
 qt5-workaround-qtbug-29426.patch                |   12 -------
 qtbase-opensource-src-5.2.1-QTBUG-38367.patch   |   17 ----------
 sources                                         |    2 +-
 11 files changed, 44 insertions(+), 77 deletions(-)
---