diff options
author | 2009-03-25 12:05:40 +0100 | |
---|---|---|
committer | 2009-03-25 12:05:40 +0100 | |
commit | 2fa972014da492233781741da3cb8880d6b8fa42 (patch) | |
tree | 2a81fd409c1d55b293b0d770c83f8bd3239d637e /recipes/qt4/qt_staging.inc | |
parent | 8e64571067be19103941e6f32f08c871680b23e4 (diff) | |
download | openembedded-2fa972014da492233781741da3cb8880d6b8fa42.tar.gz |
qt4: make use of qt4-tools-native instead of qmake2-native and uicmoc4-native
Diffstat (limited to 'recipes/qt4/qt_staging.inc')
-rw-r--r-- | recipes/qt4/qt_staging.inc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes/qt4/qt_staging.inc b/recipes/qt4/qt_staging.inc index 21e1b4c31f..c7b1e66669 100644 --- a/recipes/qt4/qt_staging.inc +++ b/recipes/qt4/qt_staging.inc @@ -16,12 +16,10 @@ do_stage_append() { sed -i s#"-L${S}/lib"##g libQt*.la sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la - # FIXME: is this really needed? - 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) + install -d ${STAGING_DATADIR}/${QT_DIR_NAME}/bin + ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 ${STAGING_DATADIR}/${QT_DIR_NAME}/bin/qmake + for qttool in qmake moc uic uic3 rcc lrelease lupdate; do + ln -sf ${STAGING_BINDIR_NATIVE}/${qttool}4 ${STAGING_DATADIR}/${QT_DIR_NAME}/bin/${qttool} done } |