6 files changed, 39 insertions, 99 deletions
diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc
index 5b901a2e1b..fe9138699f 100644
--- a/packages/qt4/qt4-x11-free.inc
+++ b/packages/qt4/qt4-x11-free.inc
@@ -22,5 +22,6 @@ QT_LIBRARY_NAME = "libQt"
 QT_DIR_NAME = "qt4"
 require qt_depends.inc
 require qt_packaging.inc
+require qt_staging.inc
 
 inherit qt4x11
diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb
index 8b557a086c..7d30503c07 100644
--- a/packages/qt4/qt4-x11-free_4.3.3.bb
+++ b/packages/qt4/qt4-x11-free_4.3.3.bb
@@ -1,61 +1,4 @@
-STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4"
-
-
-
-# FIXME:
-# * add missing options
-QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl"
-
-
-PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Network Script Sql Svg Test Xml"
-
-do_stage() {
-	oe_runmake install INSTALL_ROOT=/
-	install -d ${STAGING_QT_DIR}
-	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
-	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
-	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
-	sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri
-	for pcc in AssistantClient DBus Test UiTools ; do
-		sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc
-	done
-	install -d ${PKG_CONFIG_DIR}/
-        for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do
-		sed -i -e 's,$(OE_QMAKE_LIBS_X11),-lX11 -lXext,g' $pc
-                install -m 0644 $pc ${PKG_CONFIG_DIR}/
-        done
-}
-
-# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well...
-# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing...
-do_install() {
-	install -d ${D}${libdir}
-	install -d ${D}${bindir}
-	install -d ${D}${includedir}
-	for part in ${PARTS}
-	do
-		oe_libinstall -so -C lib libQt$part ${D}${libdir}
-	done
-	oe_libinstall -a -C lib libQtUiTools ${D}${libdir}
-	cp -pPR include/* ${D}${includedir}
-	cp -pPR plugins ${D}${libdir}
-	cp -pPR bin/* ${D}${bindir}
-
-	install -d ${D}${bindir}/qt4-examples
-	for binary in `find examples -perm 0755 -type f`
-	do
-		install -m 0755 $binary ${D}${bindir}/qt4-examples/
-	done
-	install -d ${D}${bindir}/qt4-demos
-	for binary in `find demos -perm 0755 -type f`
-	do
-		install -m 0755 $binary ${D}${bindir}/qt4-demos/
-	done
-	rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc
-}
-
 require qt4-x11-free.inc
-
 SRC_URI += " \
            file://0002-fix-resinit-declaration.patch;patch=1 \
            file://0006-freetype-host-includes.patch;patch=1 \
diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc
index 86ab0e784c..d19c6f8295 100644
--- a/packages/qt4/qt_packaging.inc
+++ b/packages/qt4/qt_packaging.inc
@@ -109,3 +109,15 @@ python populate_packages_prepend() {
 	translationdir = bb.data.expand('${datadir}/qtopia/translations/', d)
 	do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' )
 }
+
+
+do_install() {
+    oe_runmake install INSTALL_ROOT=${D}
+
+    # These are host binaries, we should only use them in staging
+    rm -rf ${D}/${bindir}
+    rm -rf ${D}/${datadir}/mkspecs
+
+    install -d ${D}/${libdir}/fonts
+    touch ${D}/${libdir}/fonts/fontdir
+}
diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
new file mode 100644
index 0000000000..ecfe0bb321
--- /dev/null
+++ b/packages/qt4/qt_staging.inc
@@ -0,0 +1,25 @@
+# Fixing up some Qt .pc files
+do_stage_append() {
+    cd ${STAGING_LIBDIR}/pkgconfig
+    sed -i s#"-L${S}/lib"##g Qt*.pc
+    sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc
+    sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc
+}
+
+STAGE_TEMP = "${WORKDIR}/temp-staging"
+do_stage() {
+    rm -rf ${STAGE_TEMP}
+    mkdir -p ${STAGE_TEMP}
+    oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
+
+    install -d ${STAGING_INCDIR}/${QT_DIR_NAME}
+    install -d ${STAGING_LIBDIR}/${QT_DIR_NAME}
+    cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/${QT_DIR_NAME}/
+
+    for i in ${STAGE_TEMP}/${libdir}/*.la
+    do
+        oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4
+    done
+
+    rm -rf ${STAGE_TEMP}
+}
diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc
index 204378af07..178d0a354a 100644
--- a/packages/qt4/qtopia-core.inc
+++ b/packages/qt4/qtopia-core.inc
@@ -21,5 +21,6 @@ QT_LIBRARY_NAME = "libQt"
 QT_DIR_NAME = "qtopia"
 require qt_depends.inc
 require qt_packaging.inc
+require qt_staging.inc
 
 inherit qtopia4core
diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb
index e7187b9309..65f0203ea0 100644
--- a/packages/qt4/qtopia-core_4.3.3.bb
+++ b/packages/qt4/qtopia-core_4.3.3.bb
@@ -1,43 +1 @@
-QT_CONFIG_FLAGS += " \
-    -nomake demos -nomake examples -nomake tools \
-    -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}"
-
-do_stage_append() {
-    echo "Fixing up Qt"
-    cd ${STAGING_LIBDIR}/pkgconfig
-    sed -i s#"-L${S}/lib"##g Qt*.pc
-    sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc
-    sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc
-}
-
-do_install() {
-    oe_runmake install INSTALL_ROOT=${D}
-
-    # These are host binaries, we should only use them in staging
-    rm -rf ${D}/${bindir}
-    rm -rf ${D}/${datadir}/mkspecs
-        
-    touch ${D}/${libdir}/fonts/fontdir
-}
-
-
-
-STAGE_TEMP = "${WORKDIR}/temp-staging"
-do_stage() {
-    rm -rf ${STAGE_TEMP}
-    mkdir -p ${STAGE_TEMP}
-    oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
-
-    install -d ${STAGING_INCDIR}/qtopiacore4
-    install -d ${STAGING_LIBDIR}/qtopiacore4
-    cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/
-
-    for i in ${STAGE_TEMP}/${libdir}/*.la
-    do
-        oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4
-    done
-
-    rm -rf ${STAGE_TEMP}
-}
-
 require qtopia-core.inc