[meta-opie,10/17] uicmoc-native: install tools with suffix 2
Submitted by lumag on Sept. 18, 2011, 11:23 a.m.
|
Patch ID: 11643
Details
Commit Message
@@ -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}
}
To remove conflicts with Qt4, install Qt2 tools with suffix "2", like moc2, uic2, qvfb2. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> --- recipes-qt/uicmoc/uicmoc-native_2.3.10.bb | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)