[mingw-qt/f21: 3/3] Merge branch 'master' into f21

[Erik van Pienbroek]

commit b1f122f5f5eafd7ea151c395a18b8704c51a3ff3
Merge: f9a4f6c 0436522
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 22 23:20:42 2015 +0100

    Merge branch 'master' into f21

 mingw-qt.spec                                 | 14 +++++++++++++-
 qt4-fix-gcc5-compatibility.patch              | 11 +++++++++++
 qt4-use-correct-pkg-config-static-flags.patch | 14 ++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
---