summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt-4.8.1.inc
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-04-30 14:19:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-03 15:38:06 +0100
commit1923455340fca5e4b68a2c3ac3566a99baa93cd9 (patch)
tree8c0c3ecfe87983862151448155cc562b6daa951d /meta/recipes-qt/qt4/qt-4.8.1.inc
parentbb996003547f9b93b734ddac11407b4eb42ecfac (diff)
downloadopenembedded-core-1923455340fca5e4b68a2c3ac3566a99baa93cd9.tar.gz
qt4: fix compilation issue
gcc 4.7 uncovers a type mismatch in the code. And this commit fixes the issue: | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive] | In file included from ./wtf/Platform.h:1217:0, | from ./config.h:30, | from wtf/gobject/GOwnPtr.cpp:19: | wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.1.inc')
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc b/meta/recipes-qt/qt4/qt-4.8.1.inc
index 8c38caee3c..2fc4228612 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.1.inc
@@ -23,6 +23,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://gcc47-fix.patch \
file://gcc47-fix2.patch \
file://disable-fuse-gold-flag.patch \
+ file://fix_conflicting_types.patch \
"
SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"