summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-07-04 09:50:32 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:44:13 +0100
commit0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (patch)
treedbf652bc6adf22bc60c0fc5f9d77f21de9f5fa5b /meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch
parent262fa7ee4608c02e41092d3dccaf81463dd4f833 (diff)
downloadpoky-0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8.tar.gz
qt4: upgrade to 4.8.5
Removed patches integrated upstream. Added INSANE_SKIP libdir for examples packages as it includes plugin shared libraries outside of libdir. (From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch
deleted file mode 100644
index 498f14f69a..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From https://codereview.qt-project.org/p/qt/qt
2 * branch refs/changes/22/53322/2 -> FETCH_HEAD
3From 28524b867ee8c9784f00eec0f07e4d9491a651b8 Mon Sep 17 00:00:00 2001
4From: Thiago Macieira <thiago.macieira@intel.com>
5Date: Tue, 9 Apr 2013 16:41:23 -0700
6Subject: [PATCH] Remove unnecessary typedef, found by GCC 4.8
7
8qtconcurrentfilter.h:108:47: warning: typedef 'Iterator' locally defined but not used [-Wunused-local-typedefs]
9
10Qt5 commit: d4c241a98059edaa7a4b15beb1cfd16ed041284e (qtbase)
11Task-number: QTBUG-30594
12Change-Id: Icc69e41c2d4e11962f0c8434236d4847b46e7d9d
13
14Upstream-Status: Pending for 4.8.5 [1]
15
16[1] https://codereview.qt-project.org/#change,53322
17
18Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
19---
20 src/corelib/concurrent/qtconcurrentfilter.h | 1 -
21 1 files changed, 0 insertions(+), 1 deletions(-)
22
23diff --git a/src/corelib/concurrent/qtconcurrentfilter.h b/src/corelib/concurrent/qtconcurrentfilter.h
24index 50b58bd..5a70182 100644
25--- a/src/corelib/concurrent/qtconcurrentfilter.h
26+++ b/src/corelib/concurrent/qtconcurrentfilter.h
27@@ -105,7 +105,6 @@ namespace QtConcurrent {
28 template <typename Sequence, typename KeepFunctor, typename ReduceFunctor>
29 ThreadEngineStarter<void> filterInternal(Sequence &sequence, KeepFunctor keep, ReduceFunctor reduce)
30 {
31- typedef typename Sequence::const_iterator Iterator;
32 typedef FilterKernel<Sequence, KeepFunctor, ReduceFunctor> KernelType;
33 return startThreadEngine(new KernelType(sequence, keep, reduce));
34 }
35--
361.7.4.4
37