classes/qt4x11.bbclass, uicmoc4-native: add qt3support

diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index cb836cc..7046ef1 100644 (file)
--- 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/packages/uicmoc/uicmoc4-native_4.3.0.bb b/packages/uicmoc/uicmoc4-native_4.3.0.bb
index 341b092..fbfd812 100644 (file)
--- 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/
 }