[oe] [meta-opie 10/17] uicmoc-native: install tools with suffix 2
Dmitry Eremin-Solenikov
dbaryshkov at gmail.com
Sun Sep 18 11:23:12 UTC 2011
To remove conflicts with Qt4, install Qt2 tools with suffix "2", like
moc2, uic2, qvfb2.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
---
recipes-qt/uicmoc/uicmoc-native_2.3.10.bb | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb b/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb
index 5846fc5..e6bcba1 100644
--- a/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb
+++ b/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E)
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL QPL"
-PR = "r5"
+PR = "r6"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
file://fix-makefile.patch \
@@ -47,8 +47,9 @@ do_compile() {
do_install() {
install -d ${D}${bindir}
- install -m 0755 bin/moc ${D}${bindir}
- install -m 0755 bin/uic ${D}${bindir}
+ install -m 0755 bin/moc ${D}${bindir}/moc2
+ install -m 0755 bin/uic ${D}${bindir}/uic2
+ install -m 0755 tools/qvfb/qvfb ${D}${bindir}/qvfb2
install -m 0755 tools/makeqpf/makeqpf ${D}${bindir}
}
--
1.7.2.5
More information about the Openembedded-devel
mailing list