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

[Erik van Pienbroek]

commit f9a4f6c10a434bf6f13efbe516ba9c79f6ebd1b0
Merge: b64ae37 e70e3b4
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Dec 22 16:40:12 2014 +0100

    Merge branch 'master' into f21

 mingw-qt.spec                                      |   56 +++-
 ...-set-shared-config-flag-for-lib-templates.patch |    8 -
 qt-merge-static-and-shared-library-trees.patch     |  313 ++------------------
 qt4-fix-linking-against-static-dbus.patch          |   14 +
 4 files changed, 85 insertions(+), 306 deletions(-)
---