diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-08-09 16:17:24 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-08-09 16:17:24 +0200 |
| commit | 96efe18731e6dddf5fedbe90478fcf9565155081 (patch) | |
| tree | cde9e1a254386a1f770a60ee24fc9ba2fb0633af /recipes/qt4 | |
| parent | 2215a06d3408f57cf4edd5a072132333111c3830 (diff) | |
| parent | 7e5dace40c5966a27c62e7b893bf29aded35e3c1 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/qt4')
| -rw-r--r-- | recipes/qt4/qt4-embedded.inc | 4 | ||||
| -rw-r--r-- | recipes/qt4/qt4-tools-sdk_4.5.2.bb | 9 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free.inc | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 962233efb1..95b770a5a4 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://www.trolltech.com" DEPENDS += "directfb tslib" INC_PR = "r14" -QT_BASE_NAME = "qt4-embedded" -QT_BASE_LIB = "libqt-embedded" +QT_BASE_NAME ?= "qt4-embedded" +QT_BASE_LIB ?= "libqt-embedded" QT_DIR_NAME = "qtopia" QT_LIBINFIX = "E" diff --git a/recipes/qt4/qt4-tools-sdk_4.5.2.bb b/recipes/qt4/qt4-tools-sdk_4.5.2.bb index fafb7710c9..c0f2f7aad4 100644 --- a/recipes/qt4/qt4-tools-sdk_4.5.2.bb +++ b/recipes/qt4/qt4-tools-sdk_4.5.2.bb @@ -61,12 +61,11 @@ do_compile() { done } -do_stage() { - install -d ${STAGING_BINDIR_NATIVE}/ - install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2 +do_install() { + install -d ${D}${bindir} + install -m 0755 bin/qmake ${D}${bindir}/qmake2 for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do - install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4 + install -m 0755 bin/${i} ${D}${bindir}/${i}4 done } - diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index 6ca20561cd..59c973f208 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -24,8 +24,8 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}" QT_GLFLAGS ?= "-no-opengl" QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" -QT_BASE_NAME = "qt4" -QT_BASE_LIB = "libqt" +QT_BASE_NAME ?= "qt4" +QT_BASE_LIB ?= "libqt" QT_DIR_NAME = "qt4" QT_LIBINFIX = "" |