From: Jonathan McDowell <noodles@earth.li>
Date: Thu, 14 Jul 2005 06:27:55 +0000 (+0000)
Subject: Fix compilation of uicmoc-native under gcc4
X-Git-Tag: Release-2010-05/1~9453^2~4169^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4e3359cd09563ec5346ef3d3e6f9d020d93f49a;p=openembedded.git

Fix compilation of uicmoc-native under gcc4
---

diff --git a/packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch b/packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch
new file mode 100644
index 0000000000..633fe86c29
--- /dev/null
+++ b/packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch
@@ -0,0 +1,12 @@
+--- qt-2.3.10/src/kernel/qwindowsystem_qws.h.orig	2005-07-13 20:23:30.061728456 +0100
++++ qt-2.3.10/src/kernel/qwindowsystem_qws.h	2005-07-13 20:37:57.183905848 +0100
+@@ -168,6 +168,9 @@
+ class QWSMouseHandler;
+ struct QWSCommandStruct;
+ 
++class QWSInputMethod;
++class QWSGestureMethod;
++
+ #ifndef QT_NO_QWS_MULTIPROCESS
+ class QWSServer : public QWSServerSocket
+ #else
diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb
index 7d39cc15eb..a596ec6824 100644
--- a/packages/uicmoc/uicmoc-native_2.3.10.bb
+++ b/packages/uicmoc/uicmoc-native_2.3.10.bb
@@ -7,7 +7,8 @@ PR = "r0"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
            file://fix-makefile.patch;patch=1 \
-           file://gcc3_4.patch;patch=1"
+           file://gcc3_4.patch;patch=1" \
+           file://gcc4.patch;patch=1"
 S = "${WORKDIR}/qt-${PV}"
 
 inherit native qmake-base