update qt5 module packages to 5.0.2

1 files changed, 6 insertions, 41 deletions

diff --git a/src/qtbase-1-cherrypicks.patch b/src/qtbase-1-cherrypicks.patch
index fbe4d2e..db6afd3 100644
--- a/src/qtbase-1-cherrypicks.patch
+++ b/src/qtbase-1-cherrypicks.patch
@@ -1,10 +1,10 @@
 This file is part of MXE.
 See index.html for further information.
 
-From 6b0f024e4fa9e227a2c2da41f189add55f3225a9 Mon Sep 17 00:00:00 2001
+From d04c8e88266737b6fb7ed29780905b54ee68eb5e Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 26 Feb 2013 13:23:33 +0100
-Subject: [PATCH 1/4] use pkg-config for freetype
+Subject: [PATCH 1/3] use pkg-config for freetype
 
 Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a
 
@@ -24,10 +24,10 @@ index 6b5f6d0..d21f4e3 100644
 1.8.1.4
 
 
-From 4928a5d5d09199996567595a91498aa151df9773 Mon Sep 17 00:00:00 2001
+From b96f92ed207c7039d753e0ba8fffda4d676c3f38 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 22 Dec 2012 17:45:34 +0100
-Subject: [PATCH 2/4] WIP: qmake writeFile(): work around concurrent
+Subject: [PATCH 2/3] WIP: qmake writeFile(): work around concurrent
  QDir::mkpath() failure
 
 This actually happened when building qtimageformats with make -j4.
@@ -65,10 +65,10 @@ index f46d66b..4632cf7 100644
 1.8.1.4
 
 
-From cfbe1ce777abb153d1b03b23c777b773498e2a3c Mon Sep 17 00:00:00 2001
+From 63f1f49850ac741eb604d6cae959546d73ea9a7d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org>
 Date: Sat, 23 Feb 2013 23:14:50 -0500
-Subject: [PATCH 3/4] Rename qAbs Function for timeval
+Subject: [PATCH 3/3] Rename qAbs Function for timeval
 
 This decouples it from qAbs which is declared as a constexpr under
 certain compilation flags and enables for qtbase to be compiled with
@@ -104,38 +104,3 @@ index 0eee425..7a29247 100644
 -- 
 1.8.1.4
 
-
-From dad4c7019a14eeee37ec168501b883c1ebfaeff6 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Wed, 27 Mar 2013 22:40:39 +0100
-Subject: [PATCH 4/4] fix QT_NO_ACCESSIBILITY build
-
-Follow-up to ad05af534dc61b0c07b2c676d8f1ff040d9fbf7b
-
-Change-Id: I561b0b0b1a098556f9de909241b448307a271985
-
-diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp
-index 48d2027..93c2065 100644
---- a/src/widgets/styles/qwindowsvistastyle.cpp
-+++ b/src/widgets/styles/qwindowsvistastyle.cpp
-@@ -520,6 +520,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
-         }
-         break;
-     case PE_Frame: {
-+#ifndef QT_NO_ACCESSIBILITY
-         if (QStyleHelper::isInstanceOf(option->styleObject, QAccessible::EditableText)) {
-             painter->save();
-             int stateId = ETS_NORMAL;
-@@ -545,6 +546,9 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
-             d->drawBackground(theme);
-             painter->restore();
-         } else {
-+#else
-+        {
-+#endif
-             QWindowsXPStyle::drawPrimitive(element, option, painter, widget);
-         }
-     }
--- 
-1.8.1.4
-