[qt5-qtbase/f20: 8/8] Merge branch 'master' into f20

[Rex Dieter]

commit 86bee4651f3021c35dc40e647c779475c16e8b47
Merge: b2e253d f29db92
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Jan 31 22:21:32 2015 -0600

    Merge branch 'master' into f20

 qt5-qtbase.spec                               |   16 +-
 qtbase-opensource-src-5.4.0-QTBUG-42985.patch |  580 +++++++++++++++++++++++++
 2 files changed, 595 insertions(+), 1 deletions(-)
---