summaryrefslogtreecommitdiffstats
path: root/package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch
diff options
context:
space:
mode:
authorLuca Ceresoli <luca@lucaceresoli.net>2015-06-04 19:28:41 +0200
committerPeter Korsgaard <peter@korsgaard.com>2015-06-04 22:59:11 +0200
commit9a2cc7fe0aa00b64e815f9a267588ba75b2b74d1 (patch)
tree33a4dc95cce90445c5778346cbc7013bea50e246 /package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch
parent9f4ec376567f94a68ea3e67a48f9a000814b04ca (diff)
downloadbuildroot-9a2cc7fe0aa00b64e815f9a267588ba75b2b74d1.tar.gz
buildroot-9a2cc7fe0aa00b64e815f9a267588ba75b2b74d1.zip
qt: bump to 4.8.7
Remove patches applied upstream. Add hash file. Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch')
-rw-r--r--package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch b/package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch
deleted file mode 100644
index 6d66633d35..0000000000
--- a/package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8ae2c4e9ae59041384f95d9125d214ecb0b54f6f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
- <perezmeyer@gmail.com>
-Date: Wed, 8 Apr 2015 21:45:37 -0300
-Subject: [PATCH] Remove filterIncludePath and filterLibraryPath usage.
-
-They are only defined in qt5's configure script.
-
-Task-number: QTBUG-45463
-Change-Id: Ibce2bd1d06e35de5174b15919c939b41cf013d05
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-
-Upstream: http://code.qt.io/cgit/qt/qt.git/patch/?id=90a09c7aedb3036aa1f572a959c67b1f8fcd9e9c
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index a3cde93..317e826 100755
---- a/configure
-+++ b/configure
-@@ -5575,8 +5575,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
- [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config`
- # Be careful not to use native pg_config when cross building.
- if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
-- QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath`
-- QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath`
-+ QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`
-+ QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`
- fi
- [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
- [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
---
-2.1.4
-
OpenPOWER on IntegriCloud