diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-05-16 23:28:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-21 00:18:45 +0100 |
commit | 503c669ca7af397cba0286908f2db2b5d533c0c3 (patch) | |
tree | a1cb27fc4a01bb700b7d87769c223ea8a2b4f400 /meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch | |
parent | 0948a237ddfcd92dcc4a21e238a963568161f12d (diff) | |
download | ast2050-yocto-poky-503c669ca7af397cba0286908f2db2b5d533c0c3.zip ast2050-yocto-poky-503c669ca7af397cba0286908f2db2b5d533c0c3.tar.gz |
qt: fix warning -Wunused-local-typedefs introduced by gcc 4.8
in meta-oe maliit-framework failed with
| In file included from /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt4/QtCore/QtCore:53:0,
| from ../utils/core-utils.cpp:18:
| /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt4/QtCore/qtconcurrentfilter.h: In function 'QtConcurrent::ThreadEngineStarter<void> QtConcurrent::filterInternal(Sequence&, KeepFunctor, Redu
| /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt4/QtCore/qtconcurrentfilter.h:108:47: error: typedef 'Iterator' locally defined but not used [-Werror=unused-local-typedefs]
| typedef typename Sequence::const_iterator Iterator;
| ^
| cc1plus: all warnings being treated as errors
(From OE-Core rev: 4cb93a42bae3dfa53880a9475a92cc046dde5767)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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.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 0000000..498f14f --- /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 + |