summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan McDowell <noodles@earth.li>2005-07-14 06:27:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-14 06:27:55 +0000
commitb4e3359cd09563ec5346ef3d3e6f9d020d93f49a (patch)
tree8c627e8bbbf74484c8503d8bd355e5bc1764db05
parentb2cc77eeaa80156b8b4928fcd824438ea182201b (diff)
Fix compilation of uicmoc-native under gcc4
-rw-r--r--packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch12
-rw-r--r--packages/uicmoc/uicmoc-native_2.3.10.bb3
2 files changed, 14 insertions, 1 deletions
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