qt4 staging: try harder to fish out qt tools

diff --git a/packages/qt4/qt-embedded_4.4.1.bb b/packages/qt4/qt-embedded_4.4.1.bb
index 70a461d2d27c0f02ed0f9e87815cd7e90befbaf1..0bc82e77af7ab9542ee7e5b67165cf6eb26c697e 100644 (file)
--- a/packages/qt4/qt-embedded_4.4.1.bb
+++ b/packages/qt4/qt-embedded_4.4.1.bb
@@ -3,7 +3,7 @@ require qtopia-core.inc
 PROVIDES += "qtopia-core"
 RPROVIDES_${PN} = "qtopia-core"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
            file://qconfig-oe.h \

diff --git a/packages/qt4/qt4-x11-free_4.4.1.bb b/packages/qt4/qt4-x11-free_4.4.1.bb
index 7d30503c072024ea7ffefb56df54fac38c3c9257..3bef76f138ef018c9d4ab9c942eed380e468aaf2 100644 (file)
--- a/packages/qt4/qt4-x11-free_4.4.1.bb
+++ b/packages/qt4/qt4-x11-free_4.4.1.bb
@@ -1,4 +1,6 @@
 require qt4-x11-free.inc
+PR = "r1"
+
 SRC_URI += " \
            file://0002-fix-resinit-declaration.patch;patch=1 \
            file://0006-freetype-host-includes.patch;patch=1 \

diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
index 75b5b5735d68518f5299bf994db9542c35b74156..49f51a27145b62a7ac682d3cd4a0d572890722c2 100644 (file)
--- a/packages/qt4/qt_staging.inc
+++ b/packages/qt4/qt_staging.inc
@@ -18,6 +18,7 @@ do_stage_append() {
 
     install -d ${STAGING_DIR_TARGET}/qt4/bin
     cp ${STAGING_DIR_NATIVE}/qt4/bin/* ${STAGING_DIR_TARGET}/qt4/bin/ || true 
+    cp ${STAGING_DIR_NATIVE}/${bindir}/{rcc*,uic*,moc*} ${STAGING_DIR_TARGET}/qt4/bin/ || true 
     for qttool in ${STAGING_DIR_TARGET}/qt4/bin/*4 ; do
          ln -sf $qttool  ${STAGING_DIR_TARGET}/qt4/bin/$(basename $qttool |sed s:4::g) 
     done

diff --git a/packages/qt4/qtopia-core_4.4.1.bb b/packages/qt4/qtopia-core_4.4.1.bb
index 158e29c432677ba2da13650934f2db66ba78fce5..061fd2cd6c4c3f58bcf9e8bb6dc262eadfe3f390 100644 (file)
--- a/packages/qt4/qtopia-core_4.4.1.bb
+++ b/packages/qt4/qtopia-core_4.4.1.bb
@@ -3,4 +3,4 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 
 #keep in sync with qt-embedded_${PV}.bb
-PR = "r0"
+PR = "r1"