merge of 'd7fd55c2b036fe77aaf2964c99702f65a6833031'

     and 'df688aa66e8dd2c9f76bf0b2551461346a1d5981'

27 files changed, 121 insertions, 53 deletions

diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index cb836cc362..7046ef1cb9 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -6,6 +6,7 @@ DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-fr
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
 export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
+export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
 export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
 export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index a4dd4b18a8..77d6c1ee83 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -468,7 +468,7 @@ IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
 OES_BITBAKE_CONF = "1"
 
 ##################################################################
-# Task-base stuff
+# Machine properties and task-base stuff
 ##################################################################
 
 MACHINE_FEATURES ?= "kernel26"
@@ -477,7 +477,13 @@ DISTRO_FEATURES ?= ""
 # This is used to limit what packages goes into images built, so set big by default
 ROOT_FLASH_SIZE ?= "256"
 
-GUI_MACHINE_CLASS ?= "smallscreen"
+MACHINE_GUI_CLASS ?= "smallscreen"
+# GUI_MACHINE_CLASS is deprecated, please use MACHINE_GUI_CLASS instead
+GUI_MACHINE_CLASS ?= "${MACHINE_GUI_CLASS}"
+MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
+MACHINE_DISPLAY_ORIENTATION ?= "0"
+MACHINE_DISPLAY_BPP ?= "16"
 
 DISTRO_EXTRA_RDEPENDS ?= ""
 DISTRO_EXTRA_RRECOMMENDS ?= ""
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 99d85977b9..b64a66ff60 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 	kernel-module-pxapwm-bl \
 	kernel-module-snd-pxa2xx-ac97 \
 	kernel-module-snd-pxa2xx-pcm \
-	kernel-module-wm97xx-ts \		
 	"
 
 #
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 495329457c..35c8f5d3d3 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -9,12 +9,20 @@
 
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
-
+RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.0.4"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://asound.state \
-	   file://alsa-state"
+           file://alsa-state "
+
+SRC_URI_append_fic-gta01 = " \
+  file://capturehandset.state \
+  file://captureheadset.state \
+  file://gsmbluetooth.state \
+  file://gsmhandset.state \
+  file://gsmheadset.state \
+  file://stereoout.state"
 
 inherit update-rc.d
 
@@ -22,13 +30,17 @@ INITSCRIPT_NAME = "alsa-state"
 INITSCRIPT_PARAMS = "defaults 10"
 
 do_install() {
-	install -d ${D}${sysconfdir}/init.d
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
 	
-	install -m 0644 ${WORKDIR}/asound.state ${D}${sysconfdir}
-	install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
+	install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
 }
 
-FILES_${PN} = "${sysconfdir}/*"
+PACKAGES += "alsa-states"
+FILES_${PN} = "${sysconfdir}/init.d"
+FILES_alsa-states = "${sysconfdir}/*.state"
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_alsa-states = "${MACHINE}"
 
 pkg_postinst_${PN}() {
 	if test -z "$D"
diff --git a/packages/alsa/alsa-states/fic-gta01/capturehandset.state b/packages/alsa/alsa-state/fic-gta01/capturehandset.state
index 4a55f09035..4a55f09035 100644
--- a/packages/alsa/alsa-states/fic-gta01/capturehandset.state
+++ b/packages/alsa/alsa-state/fic-gta01/capturehandset.state
diff --git a/packages/alsa/alsa-states/fic-gta01/captureheadset.state b/packages/alsa/alsa-state/fic-gta01/captureheadset.state
index 3a27323b25..3a27323b25 100644
--- a/packages/alsa/alsa-states/fic-gta01/captureheadset.state
+++ b/packages/alsa/alsa-state/fic-gta01/captureheadset.state
diff --git a/packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
index a0c0c95ea6..a0c0c95ea6 100644
--- a/packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
diff --git a/packages/alsa/alsa-states/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state
index a83141fcbb..a83141fcbb 100644
--- a/packages/alsa/alsa-states/fic-gta01/gsmhandset.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state
diff --git a/packages/alsa/alsa-states/fic-gta01/gsmheadset.state b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state
index e732b77db8..e732b77db8 100644
--- a/packages/alsa/alsa-states/fic-gta01/gsmheadset.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state
diff --git a/packages/alsa/alsa-states/fic-gta01/stereoout.state b/packages/alsa/alsa-state/fic-gta01/stereoout.state
index c27b78bb27..c27b78bb27 100644
--- a/packages/alsa/alsa-states/fic-gta01/stereoout.state
+++ b/packages/alsa/alsa-state/fic-gta01/stereoout.state
diff --git a/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty b/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty
+++ /dev/null
diff --git a/packages/alsa/alsa-states_0.0.0.bb b/packages/alsa/alsa-states_0.0.0.bb
deleted file mode 100644
index 28c40b3fea..0000000000
--- a/packages/alsa/alsa-states_0.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Machine specific alsa state files"
-SECTION = "base"
-LICENSE = "MIT"
-PR = "r0"
-
-SRC_URI = "file://*.state"
-
-do_install () {
-    install -d ${D}${sysconfdir}/alsa
-    install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}/alsa
-}
-
-FILES_${PN} += "${sysconfdir}/alsa/*"
diff --git a/packages/efl1/ecore-native_0.9.9.038.bb b/packages/efl1/ecore-native_0.9.9.038.bb
index 7b3212dc1a..8026adb49c 100644
--- a/packages/efl1/ecore-native_0.9.9.038.bb
+++ b/packages/efl1/ecore-native_0.9.9.038.bb
@@ -1,11 +1,12 @@
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
+PR = "r1"
 
 EXTRA_OECONF = "\
                 --enable-ecore-txt \
                 --disable-ecore-x-xcb \
-                --enable-ecore-x \
+                --disable-ecore-x \
                 --enable-ecore-job \
                 --enable-ecore-directfb \
                 --enable-ecore-fb \
diff --git a/packages/file/file-native_4.20.bb b/packages/file/file-native_4.21.bb
index b797cff8ad..59535dd518 100644
--- a/packages/file/file-native_4.20.bb
+++ b/packages/file/file-native_4.21.bb
@@ -1,7 +1,5 @@
 require file_${PV}.bb
 inherit native
-
-# avoid dependency loop
 DEPENDS = ""
 PR = "r0"
 
diff --git a/packages/file/file_4.20.bb b/packages/file/file_4.21.bb
index 2b37d2515c..758f7f36fa 100644
--- a/packages/file/file_4.20.bb
+++ b/packages/file/file_4.21.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
 LICENSE = "BSD-ADV"
 DEPENDS = "file-native"
 
-SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" 
+SRC_URI = "ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-${PV}.tar.gz"
 S = "${WORKDIR}/file-${PV}"
 
 inherit autotools
diff --git a/packages/alsa/alsa-states/.mtn2git_empty b/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/alsa/alsa-states/.mtn2git_empty
+++ b/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/.mtn2git_empty
diff --git a/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch b/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch
new file mode 100644
index 0000000000..ba17293733
--- /dev/null
+++ b/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch
@@ -0,0 +1,15 @@
+Index: libsigc++-2.0.17/configure.ac
+===================================================================
+--- libsigc++-2.0.17.orig/configure.ac	2005-12-20 08:41:21.000000000 +0000
++++ libsigc++-2.0.17/configure.ac	2007-07-11 11:33:55.000000000 +0100
+@@ -105,6 +105,10 @@
+ SIGC_CXX_HAS_NAMESPACE_STD()
+ SIGC_CXX_HAS_SUN_REVERSE_ITERATOR()
+ 
++dnl FIXME Define this here since it does not seem to be defined elsewhere
++AC_DEFINE(SIGC_API, [], [Empty specifier])
++AC_DEFINE(SIGC_USING_STD(Symbol), [], [Empty specifier])
++
+ if test "X$config_error" = "Xyes" ; then
+   AC_ERROR(
+ [One or more of the required compiler features is missing.
diff --git a/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb b/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
new file mode 100644
index 0000000000..cc122993bc
--- /dev/null
+++ b/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "A library for loose coupling of C++ method calls"
+SECTION = "libs"
+PRIORITY = "optional"
+PR = "r1"
+LICENSE = "GPL LGPL"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-${PV}.tar.gz \
+           file://define_sigc_api.patch;patch=1 "
+S = "${WORKDIR}/libsigc++-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN}-dev += "${libdir}/sigc++-*/"
+
+# acpaths = ""
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}/sigc++-2.0/include
+	install -m 0644 sigc++config.h ${STAGING_LIBDIR}/sigc++-2.0/include/
+	oe_libinstall -so -C sigc++ libsigc-2.0 ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++
+	for f in sigc++/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/
+	done
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+	for f in sigc++/functors/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+	done
+
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+	for f in sigc++/adaptors/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+	done
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+	for f in sigc++/adaptors/lambda/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+	done
+
+
+}
+
diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb
index 8a782c349d..680be8c85d 100644
--- a/packages/linux/linux-hackndev-2.6_svn.bb
+++ b/packages/linux/linux-hackndev-2.6_svn.bb
@@ -6,7 +6,7 @@ PR = "r5"
 
 COMPATIBLE_MACHINE = "(palmtt3|palmtx|palmld|palmz72)"
 
-SRC_URI = "svn://svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \
+SRC_URI = "svn://hackndev.svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \
 	   file://defconfig"
 
 SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \
diff --git a/packages/qmake/qmake2-native_2.01a.bb b/packages/qmake/qmake2-native_2.01a.bb
index b4a736cb76..2ec783574c 100644
--- a/packages/qmake/qmake2-native_2.01a.bb
+++ b/packages/qmake/qmake2-native_2.01a.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
 
-PR = "r1"
+PR = "r2"
 
 QTVER = "qt-x11-opensource-src-4.3.0"
 
@@ -58,6 +58,8 @@ do_stage() {
 	install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4
 	install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
 	cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt4/
+	cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/
 }
 
 do_install() {
diff --git a/packages/qte/qte-2.3.10/devfs.patch b/packages/qte/qte-2.3.10/deprecated/devfs.patch
index dd46d516ff..dd46d516ff 100644
--- a/packages/qte/qte-2.3.10/devfs.patch
+++ b/packages/qte/qte-2.3.10/deprecated/devfs.patch
diff --git a/packages/qte/qte-2.3.10/ipaq-keyboard.patch b/packages/qte/qte-2.3.10/deprecated/ipaq-keyboard.patch
index 47474f698e..47474f698e 100644
--- a/packages/qte/qte-2.3.10/ipaq-keyboard.patch
+++ b/packages/qte/qte-2.3.10/deprecated/ipaq-keyboard.patch
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index dbdf21e1b3..47099b1038 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -54,7 +54,6 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 #
 # add device specific patches here
 #
-SRC_URI_append_simpad       = "file://devfs.patch;patch=1 "
 SRC_URI_append_c7x0         = "file://kernel-keymap-corgi.patch;patch=1 \
                                file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 \
                                file://c7x0-w100-gcc4.patch;patch=1 "
@@ -63,18 +62,11 @@ SRC_URI_append_spitz        = "file://kernel-keymap-corgi.patch;patch=1 \
 SRC_URI_append_akita        = "file://kernel-keymap-corgi.patch;patch=1 \
                                file://kernel-keymap-CXK.patch;patch=1 "
 SRC_URI_append_tosa         = "file://kernel-keymap-tosa.patch;patch=1 "
-SRC_URI_append_jornada7xx   = "file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_jornada56x   = "file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h1910        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h1940        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h2200        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h3600        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h3900        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h4000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h5000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h6300        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_hx2000       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_hx4700       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+
+# "ipaqs" used to have this, but later were proven to at least work
+# without it. Review again and see if has interesting bits to be applied
+# universally.
+#SRC_URI_append   = "file://ipaq_sound_fix.patch;patch=1 "
 
 
 S = "${WORKDIR}/qt-${PV}"
diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb
index cb9e5aaceb..21feb25fef 100644
--- a/packages/qte/qte-mt-static_2.3.10.bb
+++ b/packages/qte/qte-mt-static_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-PR = "r7"
+PR = "r8"
 
 EXTRA_OECONF += "-static -thread"
 
@@ -18,4 +18,3 @@ do_install() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "${palmqtdir}"
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index 6cc5595401..87e2a8434f 100644
--- a/packages/qte/qte-mt_2.3.10.bb
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-PR = "r15"
+PR = "r16"
 
 EXTRA_OECONF += "-thread"
 
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 3a21a12ca1..68825b6ce8 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -1,3 +1,3 @@
 require qte-common_${PV}.inc
-PR = "r51"
+PR = "r52"
 
diff --git a/packages/uicmoc/uicmoc4-native_4.3.0.bb b/packages/uicmoc/uicmoc4-native_4.3.0.bb
index 341b092e29..fbfd8125cd 100644
--- a/packages/uicmoc/uicmoc4-native_4.3.0.bb
+++ b/packages/uicmoc/uicmoc4-native_4.3.0.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
 
@@ -9,7 +10,8 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
 
 inherit native
 
-EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+		-qt-libjpeg -qt-gif -system-zlib \
 		-no-nis -no-cups -no-exceptions  \
 		-no-accessibility -no-libjpeg    \
                 -no-nas-sound -no-sm             \
@@ -18,7 +20,8 @@ EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \
                 -no-xrender   -no-fontconfig     \
                 -no-tablet    -no-xkb            \
                 -no-libpng                       \
-                -verbose -release  -fast -static "
+                -verbose -release  -fast -static \
+                -qt3support "
 EXTRA_OEMAKE = " "
 
 do_configure() {
@@ -27,15 +30,23 @@ do_configure() {
 
 do_compile() {
 	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
-	cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/corelib   && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/xml       && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/moc  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/corelib    && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/sql        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/qt3support && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/xml        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/uic  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/rcc  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/network    && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/gui        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/uic3 && oe_runmake CC="${CC}" CXX="${CXX}"
 }
 
 do_stage() {
         install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
         install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+        install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
         install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+        install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
 }