diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-09-06 22:31:10 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-09-06 22:31:10 +0000 |
| commit | 58376e87dea829d87f037f1886a049241bccbf3e (patch) | |
| tree | 6c8c43deb28fae01c88ddc8b3e1a99929c028247 /packages | |
| parent | 03acc69d70e2f263c8f4f0159ddb16c27f55f559 (diff) | |
qt4 staging: try harder to fish out qt tools
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/qt4/qt-embedded_4.4.1.bb | 2 | ||||
| -rw-r--r-- | packages/qt4/qt4-x11-free_4.4.1.bb | 2 | ||||
| -rw-r--r-- | packages/qt4/qt_staging.inc | 1 | ||||
| -rw-r--r-- | packages/qt4/qtopia-core_4.4.1.bb | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/packages/qt4/qt-embedded_4.4.1.bb b/packages/qt4/qt-embedded_4.4.1.bb index 70a461d2d2..0bc82e77af 100644 --- 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 7d30503c07..3bef76f138 100644 --- 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 75b5b5735d..49f51a2714 100644 --- 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 158e29c432..061fd2cd6c 100644 --- 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" |