diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch deleted file mode 100644 index 81245059c0..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | This patch fixes the type mismatch fixing this compile issue: | ||
4 | |||
5 | | /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] | ||
6 | | In file included from ./wtf/Platform.h:1217:0, | ||
7 | | from ./config.h:30, | ||
8 | | from wtf/gobject/GOwnPtr.cpp:19: | ||
9 | | wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here | ||
10 | NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed | ||
11 | |||
12 | |||
13 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
14 | 2012/04/30 | ||
15 | |||
16 | |||
17 | Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | ||
18 | =================================================================== | ||
19 | --- qt-everywhere-opensource-src-4.8.1/src/3rdparty.orig/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | ||
20 | +++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | ||
21 | @@ -52,7 +52,7 @@ typedef struct _GFile GFile; | ||
22 | typedef struct _GHashTable GHashTable; | ||
23 | typedef struct _GInputStream GInputStream; | ||
24 | typedef struct _GList GList; | ||
25 | -typedef struct _GMutex GMutex; | ||
26 | +typedef union _GMutex GMutex; | ||
27 | typedef struct _GPatternSpec GPatternSpec; | ||
28 | typedef struct _GPollableOutputStream GPollableOutputStream; | ||
29 | typedef struct _GSocketClient GSocketClient; | ||