From 9c169981c3fcab95c284c42e81bca16caf3950e3 Mon Sep 17 00:00:00 2001 From: Fatih Aşıcı Date: Fri, 27 Jun 2014 09:19:17 +0300 Subject: qt5: bump to 5.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove upstreamed patch. Signed-off-by: Fatih Aşıcı Signed-off-by: Peter Korsgaard --- ...ck-for-QtGui-before-building-the-examples.patch | 46 ---------------------- 1 file changed, 46 deletions(-) delete mode 100644 package/qt5/qt5script/qt5script-0001-Check-for-QtGui-before-building-the-examples.patch (limited to 'package/qt5/qt5script/qt5script-0001-Check-for-QtGui-before-building-the-examples.patch') 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 - -From e4453c92ee41943a3a1d67a725804a44e747f64e Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -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 -Reviewed-by: Allan Sandfeld Jensen ---- - 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 - -- cgit v1.2.3