sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Andreas Müller 2013-05-16 23:28:42 +00:00 committed by Richard Purdie
parent 0948a237dd
commit 503c669ca7
5 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-qt/qt4/qt4-4.8.4.inc
View File

@ -24,6 +24,7 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
file://0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch \
file://0023-qtnetwork-blacklist-two-more-certificates.patch \
file://0024-Change-all-shmget-calls-to-user-only-memory.patch \
file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \
file://g++.conf \
file://linux.conf \
"

37
meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch Normal file
View File

@ -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

2
meta/recipes-qt/qt4/qt4-embedded_4.8.4.bb
View File

@ -1,7 +1,7 @@
require qt4-${PV}.inc
require qt4-embedded.inc
PR = "${INC_PR}.3"
PR = "${INC_PR}.4"
QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}"

3
meta/recipes-qt/qt4/qt4-native.inc
View File

@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"
INC_PR = "r19"
INC_PR = "r20"
inherit native
@ -18,6 +18,7 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \
file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \
file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \
file://g++.conf \
file://linux.conf \
"

2
meta/recipes-qt/qt4/qt4-x11-free_4.8.4.bb
View File

@ -1,7 +1,7 @@
require qt4-x11-free.inc
require qt4-${PV}.inc
PR = "${INC_PR}.3"
PR = "${INC_PR}.4"
QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}"