summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2009-04-24 19:18:57 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2009-04-24 19:18:57 +0200
commit1b53dc3863dd2d66ebebeafce1fac20714c29755 (patch)
treef357d422d23dbb334428c9b4263bedd21c021441
parentb4e0df20e3724251ae39945a0aa91e6d00078b29 (diff)
Author: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Jeremy Lainé <jeremy.laine@bolloretelecom.eu>
-rw-r--r--recipes/qt4/qt4-tools-native.inc6
-rw-r--r--recipes/qt4/qt4-tools-native_4.4.3.bb2
-rw-r--r--recipes/qt4/qt4-tools-native_4.5.1.bb1
3 files changed, 6 insertions, 3 deletions
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index 75ce4e6f30..7946e6f76e 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -1,5 +1,5 @@
DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "zlib-native"
+DEPENDS = "zlib-native dbus-native"
SECTION = "libs"
HOMEPAGE = "http://www.trolltech.com"
PRIORITY = "optional"
@@ -37,6 +37,7 @@ TOBUILD = "\
src/tools/moc \
src/corelib \
src/sql \
+ src/dbus \
src/qt3support \
src/xml \
src/tools/uic \
@@ -46,6 +47,7 @@ TOBUILD = "\
src/tools/uic3 \
tools/linguist/lrelease \
tools/linguist/lupdate \
+ tools/qdbus \
"
do_compile() {
@@ -57,7 +59,7 @@ do_compile() {
do_stage() {
install -d ${STAGING_BINDIR_NATIVE}/
install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
- for i in moc uic uic3 rcc lrelease lupdate; do
+ for i in moc uic uic3 rcc lrelease lupdate qdbusxml2cpp; do
install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
done
diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb
index ef86db4703..e8fc316145 100644
--- a/recipes/qt4/qt4-tools-native_4.4.3.bb
+++ b/recipes/qt4/qt4-tools-native_4.4.3.bb
@@ -1,2 +1,2 @@
require qt4-tools-native.inc
-PR = "r3"
+PR = "r4"
diff --git a/recipes/qt4/qt4-tools-native_4.5.1.bb b/recipes/qt4/qt4-tools-native_4.5.1.bb
index cadc7357c4..ab633149ba 100644
--- a/recipes/qt4/qt4-tools-native_4.5.1.bb
+++ b/recipes/qt4/qt4-tools-native_4.5.1.bb
@@ -1,4 +1,5 @@
require qt4-tools-native.inc
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
TOBUILD := "src/tools/bootstrap ${TOBUILD}"