diff options
| author |   Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-09-18 13:55:05 +0400 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-09-18 14:04:52 +0100 |
| commit | 5c19745bcfa4f4502a92cbdceada9fbd312bd7d3 (patch) | |
| tree | 65daa6258b5f9042b76ae43936ce476c43b3de3a | |
| parent | 0d817e45b28a816a8cb5c67fabc3659fd98eb036 (diff) | |
| download | meta-opie-5c19745bcfa4f4502a92cbdceada9fbd312bd7d3.tar.gz | |
uicmoc-native: install tools with suffix 2
To remove conflicts with Qt4, install Qt2 tools with suffix "2", like
moc2, uic2, qvfb2.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
| -rw-r--r-- | 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} } |