diff options
| author |   Koen Kooi <koen@openembedded.org> | 2011-01-03 11:50:25 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2011-01-03 11:50:47 +0100 |
| commit | 83134fa0312694008bf024170c70e526b821ae4d (patch) | |
| tree | b8eea0ada83098afc15af9c1823b2b4a209693ff | |
| parent | eaf0fc03acfb262bcd614a14086a1b28ec850f46 (diff) | |
| download | openembedded-83134fa0312694008bf024170c70e526b821ae4d.tar.gz | |
qt4: switch to mysql5 to avoid header clashes in staging
Signed-off-by: Koen Kooi <koen@openembedded.org>
| -rw-r--r-- | recipes/qt4/qt4-embedded.inc | 2 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | recipes/qt4/qt4.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 60eb179a6b..87b19d4789 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 = "r25" +INC_PR = "r26" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index ff4e4547a0..ae79d58a58 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r21" +INC_PR = "r22" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch \ diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 3bebd4699d..ac1fc83b12 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 mysql postgresql sqlite sqlite3" +DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base mysql5 postgresql sqlite sqlite3" require qt4_arch.inc QT_ARCH := "${@qt_arch(d)}" |