From 9c169981c3fcab95c284c42e81bca16caf3950e3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Fri, 27 Jun 2014 09:19:17 +0300
Subject: [PATCH] qt5: bump to 5.3.1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Remove upstreamed patch.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/qt5.mk                            |  2 +-
 ...r-QtGui-before-building-the-examples.patch | 46 -------------------
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 package/qt5/qt5script/qt5script-0001-Check-for-QtGui-before-building-the-examples.patch

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index c897496fae..44e5af02d8 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,5 +1,5 @@
 QT5_VERSION_MAJOR = 5.3
-QT5_VERSION = $(QT5_VERSION_MAJOR).0
+QT5_VERSION = $(QT5_VERSION_MAJOR).1
 QT5_SITE = http://download.qt-project.org/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules/
 include $(sort $(wildcard package/qt5/*/*.mk))
 
diff --git a/package/qt5/qt5script/qt5script-0001-Check-for-QtGui-before-building-the-examples.patch b/package/qt5/qt5script/qt5script-0001-Check-for-QtGui-before-building-the-examples.patch
deleted file mode 100644
index b269740a2f..0000000000
--- a/package/qt5/qt5script/qt5script-0001-Check-for-QtGui-before-building-the-examples.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-qt5script: Check for QtGui before building the examples
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-From e4453c92ee41943a3a1d67a725804a44e747f64e Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Date: Wed, 16 Apr 2014 12:19:17 +0100
-Subject: [PATCH] qtscript: Check for QtGui before building the examples
-
-qsdbg and marshal examples need QtGui module. If QtGui is not installed
-they fail to compile.
-
-Change-Id: I1af6a8b39a0848c8208fe94a26ee57409dfd9b41
-Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
----
- examples/script/script.pro | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/examples/script/script.pro b/examples/script/script.pro
-index 3e1eae6..cc97233 100644
---- a/examples/script/script.pro
-+++ b/examples/script/script.pro
-@@ -1,7 +1,7 @@
- TEMPLATE = subdirs
--SUBDIRS = \
--    customclass \
--    qsdbg
-+SUBDIRS = customclass
-+
-+qtHaveModule(gui): SUBDIRS += qsdbg
- 
- qtHaveModule(widgets) {
-     SUBDIRS += \
-@@ -22,8 +22,7 @@ qtHaveModule(widgets) {
- }
- 
- !wince {
--    SUBDIRS += \
--        marshal
-+    qtHaveModule(gui): SUBDIRS += marshal
- }
- 
- maemo5: CONFIG += qt_example
--- 
-1.9.1
-
-- 
2.30.2