diff options
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.patch | 37 |
1 files changed, 37 insertions, 0 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 new file mode 100644 index 0000000000..498f14f69a --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch @@ -0,0 +1,37 @@ +From https://codereview.qt-project.org/p/qt/qt + * branch refs/changes/22/53322/2 -> FETCH_HEAD +From 28524b867ee8c9784f00eec0f07e4d9491a651b8 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira <thiago.macieira@intel.com> +Date: Tue, 9 Apr 2013 16:41:23 -0700 +Subject: [PATCH] Remove unnecessary typedef, found by GCC 4.8 + +qtconcurrentfilter.h:108:47: warning: typedef 'Iterator' locally defined but not used [-Wunused-local-typedefs] + +Qt5 commit: d4c241a98059edaa7a4b15beb1cfd16ed041284e (qtbase) +Task-number: QTBUG-30594 +Change-Id: Icc69e41c2d4e11962f0c8434236d4847b46e7d9d + +Upstream-Status: Pending for 4.8.5 [1] + +[1] https://codereview.qt-project.org/#change,53322 + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + src/corelib/concurrent/qtconcurrentfilter.h | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/src/corelib/concurrent/qtconcurrentfilter.h b/src/corelib/concurrent/qtconcurrentfilter.h +index 50b58bd..5a70182 100644 +--- a/src/corelib/concurrent/qtconcurrentfilter.h ++++ b/src/corelib/concurrent/qtconcurrentfilter.h +@@ -105,7 +105,6 @@ namespace QtConcurrent { + template <typename Sequence, typename KeepFunctor, typename ReduceFunctor> + ThreadEngineStarter<void> filterInternal(Sequence &sequence, KeepFunctor keep, ReduceFunctor reduce) + { +- typedef typename Sequence::const_iterator Iterator; + typedef FilterKernel<Sequence, KeepFunctor, ReduceFunctor> KernelType; + return startThreadEngine(new KernelType(sequence, keep, reduce)); + } +-- +1.7.4.4 + |