import clean BK tree at cset 1.3670

11 files changed, 364 insertions, 0 deletions

diff --git a/packages/uicmoc/.mtn2git_empty b/packages/uicmoc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uicmoc/.mtn2git_empty
diff --git a/packages/uicmoc/uicmoc-native-2.3.10/.mtn2git_empty b/packages/uicmoc/uicmoc-native-2.3.10/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uicmoc/uicmoc-native-2.3.10/.mtn2git_empty
diff --git a/packages/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch b/packages/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch
index e69de29bb2..5943f0f17b 100644
--- a/packages/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch
+++ b/packages/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- qt-2.3.7/Makefile~fix-makefile	2003-07-17 03:23:11.000000000 +0200
++++ qt-2.3.7/Makefile	2004-04-23 15:36:25.000000000 +0200
+@@ -29,7 +29,7 @@
+ 	cd tools; $(MAKE)
+ 
+ symlinks: .buildopts
+-	@cd include; rm -f q*.h;  for i in ../src/*/q*.h ../src/3rdparty/*/q*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h
++	@cd include; rm -f q*.h;  for i in ../src/*/q*.h ../src/3rdparty/*/*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h
+ 
+ sub-src: src-moc src-mt .buildopts FORCE
+ 	cd src; $(MAKE)
diff --git a/packages/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch b/packages/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch
index e69de29bb2..fc1656aa24 100644
--- a/packages/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch
+++ b/packages/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch
@@ -0,0 +1,27 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-2.3.9-snapshot-20041211/src/tools/qcstring.h~gcc3
++++ qt-2.3.9-snapshot-20041211/src/tools/qcstring.h
+@@ -119,7 +119,7 @@
+ //                   We want to keep source compatibility for 2.x
+ // ### TODO for 4.0: completely remove these and the cstr* functions
+ 
+-#if !defined(QT_GENUINE_STR)
++#if 0
+ 
+ #undef	strlen
+ #define strlen qstrlen
+--- qt-2.3.9-snapshot-20041211/src/kernel/qwsdecoration_qws.h~gcc3
++++ qt-2.3.9-snapshot-20041211/src/kernel/qwsdecoration_qws.h
+@@ -50,7 +50,7 @@
+     enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6,
+ 		TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10,
+ 		Close=11, Minimize=12, Maximize=13, Normalize=14,
+-		Menu=15, LastRegion=Menu };
++		Menu=15, LastRegion=Menu, UserDefined = 100 };
+ 
+     virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0;
+     virtual void close( QWidget * );
diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb
index e69de29bb2..7d39cc15eb 100644
--- a/packages/uicmoc/uicmoc-native_2.3.10.bb
+++ b/packages/uicmoc/uicmoc-native_2.3.10.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "GPL/QPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+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"
+S = "${WORKDIR}/qt-${PV}"
+
+inherit native qmake-base
+
+export QTDIR = "${S}"
+EXTRA_OEMAKE = 'SYSCONF_CXX="${CXX}" SYSCONF_LINK="${CXX}"'
+CXXFLAGS += " -DQWS"
+
+QT_CONFIG_FLAGS = "-depths 8,16 -no-qvfb -no-g++-exceptions -no-jpeg -no-mng \
+                   -qt-zlib -qt-libpng -no-xft -no-xkb -no-vnc -no-sm \
+                   -no-opengl -static -qconfig oe"
+
+do_configure() {
+    touch src/tools/qconfig-oe.h
+    echo "#define QT_NO_FREETYPE" >> src/tools/qconfig-oe.h
+    echo yes | ./configure ${QT_CONFIG_FLAGS} || die "Configuring qt failed"
+}
+
+do_compile() {
+    oe_runmake symlinks   || die "Can't symlink include files"
+    oe_runmake -C src/moc || die "Building moc failed"
+
+    cp src/moc/moc bin/
+
+    oe_runmake -C src                 || die "Building libqt.a failed"
+    oe_runmake -C tools/designer/util || die "Building libqutil.a failed"
+    oe_runmake -C tools/designer/uic  || die "Building uic failed"
+    oe_runmake -C tools/qvfb          || die "Building qvfb failed"
+    oe_runmake -C tools/makeqpf       || die "Building makeqpf failed"
+}
+
+do_stage() {
+    install -m 0755 bin/moc ${STAGING_BINDIR}
+    install -m 0755 bin/uic ${STAGING_BINDIR}
+    install -m 0755 tools/makeqpf/makeqpf ${STAGING_BINDIR}
+}
diff --git a/packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty b/packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty
diff --git a/packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch b/packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch
index e69de29bb2..b0ee6374ef 100644
--- a/packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch
+++ b/packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- qt-embedded-free-3.3.2/Makefile~no-examples	2003-08-11 16:37:25.000000000 +0200
++++ qt-embedded-free-3.3.2/Makefile	2004-05-11 15:53:53.000000000 +0200
+@@ -11,7 +11,7 @@
+ install: FORCE
+ 	@$(MAKE) qt.install
+ 
+-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
++all: symlinks src-qmake src-moc sub-src sub-tools
+ 	@echo
+ 	@echo "The Qt library is now built in ./lib"
+ 	@echo "The Qt examples are built in the directories in ./examples"
diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.2.bb
index e69de29bb2..98d8af763a 100644
--- a/packages/uicmoc/uicmoc3-native_3.3.2.bb
+++ b/packages/uicmoc/uicmoc3-native_3.3.2.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "GPL/QPL"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.2.tar.bz2 \
+	   file://no-examples.patch;patch=1"
+
+S = "${WORKDIR}/qt-embedded-free-3.3.2"
+
+inherit native qmake-base
+
+export QTDIR = "${S}"
+export OE_QMAKE_LINK="${CXX}"
+CXXFLAGS += " -DQWS"
+
+QT_CONFIG_FLAGS = "-release -static -depths 8,16 -qt-zlib -no-nas-sound \
+                   -no-sm -qt-libpng -no-gif -no-xshape -no-xinerama \
+                   -no-xcursor -no-xrandr -no-xrender -no-xft -no-tablet \
+                   -no-xkb -no-dlopen-opengl -no-freetype -no-thread \
+                   -no-nis -no-cups -prefix ${prefix} \
+                   -xplatform ${OE_QMAKE_PLATFORM} \
+                   -platform ${OE_QMAKE_PLATFORM}"
+
+do_configure() {
+    oe_qmake_mkspecs
+    echo "yes" | ./configure ${QT_CONFIG_FLAGS}
+}
+
+do_stage() {
+	install -m 0755 bin/moc ${STAGING_BINDIR}/moc3
+	install -m 0755 bin/uic ${STAGING_BINDIR}/uic3
+	install -m 0655 lib/*.a ${STAGING_LIBDIR}/
+	for f in include/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/
+	done
+}
diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-rc1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.0.0-rc1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uicmoc/uicmoc4-native-4.0.0-rc1/.mtn2git_empty
diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-rc1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.0.0-rc1/fix-mkspecs.patch
index e69de29bb2..491edde370 100644
--- a/packages/uicmoc/uicmoc4-native-4.0.0-rc1/fix-mkspecs.patch
+++ b/packages/uicmoc/uicmoc4-native-4.0.0-rc1/fix-mkspecs.patch
@@ -0,0 +1,179 @@
+Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf
+===================================================================
+--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/qws/linux-arm-g++/qmake.conf	2005-06-06 16:35:19.000000000 +0200
++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf	2005-06-15 21:26:15.000000000 +0200
+@@ -8,12 +8,12 @@
+ QT                      += core gui network
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+-QMAKE_CC		= arm-linux-gcc
++QMAKE_CC		= $(CCACHE) arm-linux-gcc
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		=
+ QMAKE_YACC		= yacc
+ QMAKE_YACCFLAGS		= -d
+-QMAKE_CFLAGS		= -pipe
++QMAKE_CFLAGS		= -pipe $(EXTRA_CFLAGS)
+ QMAKE_CFLAGS_WARN_ON	= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	=
+ QMAKE_CFLAGS_RELEASE	= -O2
+@@ -22,8 +22,8 @@
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+ 
+-QMAKE_CXX		= arm-linux-g++
+-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -fno-exceptions -fno-rtti
++QMAKE_CXX		= $(CCACHE) arm-linux-g++
++QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS)
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
+ QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
+@@ -45,14 +45,14 @@
+ 
+ QMAKE_LINK		= arm-linux-g++
+ QMAKE_LINK_SHLIB	= arm-linux-g++
+-QMAKE_LFLAGS		=
++QMAKE_LFLAGS		= $(EXTRA_LFLAGS)
+ QMAKE_LFLAGS_RELEASE	=
+ QMAKE_LFLAGS_DEBUG	=
+ QMAKE_LFLAGS_SHLIB      = -shared
+ QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME     = -Wl,-soname,
+ QMAKE_LFLAGS_THREAD     =
+-QMAKE_RPATH             = -Wl,-rpath,
++QMAKE_RPATH             = -Wl,-rpath-link,
+ 
+ QMAKE_LIBS		= 
+ QMAKE_LIBS_DYNLOAD      = -ldl
+Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf
+===================================================================
+--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++/qmake.conf	2005-06-06 16:34:59.000000000 +0200
++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf	2005-06-15 21:41:52.000000000 +0200
+@@ -7,7 +7,7 @@
+ CONFIG			+= qt warn_on release link_prl
+ QT			+= core gui
+ 
+-QMAKE_CC		= gcc
++QMAKE_CC		= $(CCACHE) gcc
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		= 
+ QMAKE_YACC		= yacc
+@@ -22,7 +22,7 @@
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
+ 
+-QMAKE_CXX		= g++
++QMAKE_CXX		= $(CCACHE) g++
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf
+===================================================================
+--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++34/qmake.conf	2005-06-06 16:34:59.000000000 +0200
++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf	2005-06-15 21:42:13.000000000 +0200
+@@ -7,7 +7,7 @@
+ CONFIG			+= qt warn_on release link_prl
+ QT			+= core gui
+ 
+-QMAKE_CC		= gcc34
++QMAKE_CC		= $(CCACHE) gcc34
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		= 
+ QMAKE_YACC		= yacc
+@@ -22,7 +22,7 @@
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
+ 
+-QMAKE_CXX		= g++34
++QMAKE_CXX		= $(CCACHE) g++34
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf
+===================================================================
+--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++40/qmake.conf	2005-06-06 16:34:59.000000000 +0200
++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf	2005-06-15 21:42:44.000000000 +0200
+@@ -7,7 +7,7 @@
+ CONFIG			+= qt warn_on release link_prl
+ QT			+= core gui
+ 
+-QMAKE_CC		= gcc40
++QMAKE_CC		= $(CCACHE) gcc40
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		= 
+ QMAKE_YACC		= yacc
+@@ -22,7 +22,7 @@
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
+ 
+-QMAKE_CXX		= g++40
++QMAKE_CXX		= $(CCACHE) g++40
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf
+===================================================================
+--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-32/qmake.conf	2005-06-06 16:35:00.000000000 +0200
++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf	2005-06-15 21:40:50.000000000 +0200
+@@ -8,7 +8,7 @@
+ QT			+= core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+-QMAKE_CC		= gcc
++QMAKE_CC		= $(CCACHE) gcc
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		= 
+ QMAKE_YACC		= yacc
+@@ -27,7 +27,7 @@
+ QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+ QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
+ 
+-QMAKE_CXX		= g++
++QMAKE_CXX		= $(CCACHE) g++
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf
+===================================================================
+--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-64/qmake.conf	2005-06-06 16:35:00.000000000 +0200
++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf	2005-06-15 21:41:10.000000000 +0200
+@@ -11,7 +11,7 @@
+ QT			+= core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+-QMAKE_CC		= gcc
++QMAKE_CC		= $(CCACHE) gcc
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		=
+ QMAKE_YACC		= yacc
+@@ -26,7 +26,7 @@
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+ 
+-QMAKE_CXX		= g++
++QMAKE_CXX		= $(CCACHE) g++
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf
+===================================================================
+--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++/qmake.conf	2005-06-06 16:35:00.000000000 +0200
++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf	2005-06-15 21:40:24.000000000 +0200
+@@ -8,7 +8,7 @@
+ QT			+= core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+-QMAKE_CC		= gcc
++QMAKE_CC		= $(CCACHE) gcc
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		= 
+ QMAKE_YACC		= yacc
+@@ -27,7 +27,7 @@
+ QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+ QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
+ 
+-QMAKE_CXX		= g++
++QMAKE_CXX		= $(CCACHE) g++
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
diff --git a/packages/uicmoc/uicmoc4-native_4.0.0-rc1.bb b/packages/uicmoc/uicmoc4-native_4.0.0-rc1.bb
index e69de29bb2..7d986b20dd 100644
--- a/packages/uicmoc/uicmoc4-native_4.0.0-rc1.bb
+++ b/packages/uicmoc/uicmoc4-native_4.0.0-rc1.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-desktop-${PV}.tar.bz2 \
+           file://fix-mkspecs.patch;patch=1 "
+S = "${WORKDIR}/qt-x11-opensource-desktop-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \
+		-no-nis -no-cups -no-exceptions  \
+		-no-accessibility -no-libjpeg    \
+                -no-nas-sound -no-sm             \
+                -no-xshape    -no-xinerama       \
+                -no-xcursor   -no-xrandr         \
+                -no-xrender   -no-fontconfig     \
+                -no-tablet    -no-xkb            \
+                -no-libpng                       \
+                -verbose -release  -fast -static "
+EXTRA_OEMAKE = " "
+
+do_configure() {
+	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+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}"
+}
+
+do_stage() {
+        install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+        install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+        install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+}