12 files changed, 10 insertions, 7 deletions
diff --git a/recipes/qt4/files/4.5.0/0003-no-tools.patch b/recipes/qt4/files/4.5.1/0003-no-tools.patch
index 3829ffcdc5..3829ffcdc5 100644
--- a/recipes/qt4/files/4.5.0/0003-no-tools.patch
+++ b/recipes/qt4/files/4.5.1/0003-no-tools.patch
diff --git a/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch b/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch
index 987c425138..987c425138 100644
--- a/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch
+++ b/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch
diff --git a/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch b/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch
index 3409cc0bf2..3409cc0bf2 100644
--- a/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch
+++ b/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch
diff --git a/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch b/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch
index 3efaff37d3..3efaff37d3 100644
--- a/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch
+++ b/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch
diff --git a/recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch b/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch
index 070b4ac9c1..070b4ac9c1 100644
--- a/recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch
+++ b/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch
diff --git a/recipes/qt4/files/linux.conf b/recipes/qt4/files/linux.conf
index 3471c6f9f6..90b8d65aba 100644
--- a/recipes/qt4/files/linux.conf
+++ b/recipes/qt4/files/linux.conf
@@ -28,6 +28,8 @@ QMAKE_MOC             = $(OE_QMAKE_MOC)
 QMAKE_UIC             = $(OE_QMAKE_UIC)
 QMAKE_UIC3            = $(OE_QMAKE_UIC3)
 QMAKE_RCC             = $(OE_QMAKE_RCC)
+QMAKE_QDBUSCPP2XML    = $(OE_QMAKE_QDBUSCPP2XML)
+QMAKE_QDBUSXML2CPP    = $(OE_QMAKE_QDBUSXML2CPP)
 
 QMAKE_AR              = $(OE_QMAKE_AR) cqs
 QMAKE_OBJCOPY         = objcopy
diff --git a/recipes/qt4/qt4-embedded_4.5.0.bb b/recipes/qt4/qt4-embedded_4.5.1.bb
index 35b56de48a..5da55f9c1c 100644
--- a/recipes/qt4/qt4-embedded_4.5.0.bb
+++ b/recipes/qt4/qt4-embedded_4.5.1.bb
@@ -4,7 +4,6 @@ LICENSE = "GPL LGPL QPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "tslib"
-PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index df5afd3c15..a79eed4810 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"
@@ -30,13 +30,14 @@ EXTRA_OECONF = "-prefix ${prefix} \
 EXTRA_OEMAKE = " "
 
 do_configure() {
-    echo yes | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+   (echo o; echo yes) | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }
 
 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 qdbuscpp2xml 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.0.bb b/recipes/qt4/qt4-tools-native_4.5.1.bb
index ab633149ba..ab633149ba 100644
--- a/recipes/qt4/qt4-tools-native_4.5.0.bb
+++ b/recipes/qt4/qt4-tools-native_4.5.1.bb
diff --git a/recipes/qt4/qt4-x11-free_4.5.0.bb b/recipes/qt4/qt4-x11-free_4.5.1.bb
index 0ffbbc2e09..0ffbbc2e09 100644
--- a/recipes/qt4/qt4-x11-free_4.5.0.bb
+++ b/recipes/qt4/qt4-x11-free_4.5.1.bb
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index fb44e58faa..3deffa6617 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -62,7 +62,7 @@ OTHER_PACKAGES = "\
              ${QT_BASE_NAME}-pixeltool"
 
 PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
-PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-*"
+PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-*  ${QT_BASE_NAME}-translation-*"
 
 ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}     = ""
@@ -103,7 +103,7 @@ do_configure() {
     echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
     echo "Demos=${bindir}/${QT_DIR_NAME}/demos"   >> $QT_CONF_PATH
 
-    echo yes | ./configure -v \
+    (echo o; echo yes) | ./configure -v \
             -prefix ${prefix} \
             -bindir ${bindir} \
             -libdir ${libdir} \