Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev

12 files changed, 6 insertions, 5 deletions

diff --git a/recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch b/recipes/qt4/qt4-embedded-4.5.2/0003-no-tools.patch
index 3829ffcdc5..3829ffcdc5 100644
--- a/recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch
+++ b/recipes/qt4/qt4-embedded-4.5.2/0003-no-tools.patch
diff --git a/recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.5.2/0006-freetype-host-includes.patch
index 987c425138..987c425138 100644
--- a/recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch
+++ b/recipes/qt4/qt4-embedded-4.5.2/0006-freetype-host-includes.patch
diff --git a/recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch b/recipes/qt4/qt4-embedded-4.5.2/0007-openssl-host-includes.patch
index 3409cc0bf2..3409cc0bf2 100644
--- a/recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch
+++ b/recipes/qt4/qt4-embedded-4.5.2/0007-openssl-host-includes.patch
diff --git a/recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.5.2/0008-qt-lib-infix.patch
index 3efaff37d3..3efaff37d3 100644
--- a/recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch
+++ b/recipes/qt4/qt4-embedded-4.5.2/0008-qt-lib-infix.patch
diff --git a/recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.5.2/0010-no-simpledecoration-example.patch
index 070b4ac9c1..070b4ac9c1 100644
--- a/recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch
+++ b/recipes/qt4/qt4-embedded-4.5.2/0010-no-simpledecoration-example.patch
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 26b4116f40..8d827ebd4c 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r11"
+INC_PR = "r12"
 
 QT_BASE_NAME = "qt4-embedded"
 QT_BASE_LIB  = "libqt-embedded"
diff --git a/recipes/qt4/qt4-embedded_4.5.1.bb b/recipes/qt4/qt4-embedded_4.5.2.bb
index dff754c68c..dff754c68c 100644
--- a/recipes/qt4/qt4-embedded_4.5.1.bb
+++ b/recipes/qt4/qt4-embedded_4.5.2.bb
diff --git a/recipes/qt4/qt4-tools-native_4.5.1.bb b/recipes/qt4/qt4-tools-native_4.5.2.bb
index d1962bf98f..d1962bf98f 100644
--- a/recipes/qt4/qt4-tools-native_4.5.1.bb
+++ b/recipes/qt4/qt4-tools-native_4.5.2.bb
diff --git a/recipes/qt4/qt4-tools-sdk_4.5.1.bb b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
index db919fd6df..db919fd6df 100644
--- a/recipes/qt4/qt4-tools-sdk_4.5.1.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index 23fa33f118..d6d6f126d0 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
 DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
 PROVIDES = "qt4x11"
 
-INC_PR = "r10"
+INC_PR = "r11"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch;patch=1 \
diff --git a/recipes/qt4/qt4-x11-free_4.5.1.bb b/recipes/qt4/qt4-x11-free_4.5.2.bb
index 1cc637a548..1cc637a548 100644
--- a/recipes/qt4/qt4-x11-free_4.5.1.bb
+++ b/recipes/qt4/qt4-x11-free_4.5.2.bb
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index f5da6527f0..58b8fe061f 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -1,6 +1,6 @@
 inherit qmake_base
 
-DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base"
+DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base mysql postgresql sqlite sqlite3"
 
 require qt4_arch.inc
 QT_ARCH := "${@qt_arch(d)}"
@@ -9,7 +9,7 @@ QT_ENDIAN = "${@qt_endian(d)}"
 QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \
                     -shared -no-nas-sound -no-sm -no-nis \
                     -qt-gif -system-libjpeg -system-libpng -system-zlib \
-                    -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
+                    -no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql -plugin-sql-sqlite -plugin-sql-sqlite2 \
                     -no-pch -qdbus -stl -glib -phonon -webkit"
 
 EXTRA_OEMAKE = "-e"
@@ -140,7 +140,8 @@ do_configure() {
             -crossarch ${QT_ARCH} \
             ${QT_CONFIG_FLAGS} -fast \
             -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
-            -I${STAGING_INCDIR}/freetype2
+            -I${STAGING_INCDIR}/freetype2 \
+            -I${STAGING_INCDIR}/mysql
 }
 
 do_compile() {