summaryrefslogtreecommitdiff
path: root/recipes/qt4
diff options
context:
space:
mode:
authorIhar Hrachyshka <ihar.hrachyshka@gmail.com>2009-07-07 05:47:04 +0000
committerKoen Kooi <koen@openembedded.org>2009-07-07 19:10:15 +0200
commitf3d6071476b37720b561fed60b540c4f3a10a865 (patch)
tree758a04de0b6e7fedea6b3f73cf0f5fb352d0f03d /recipes/qt4
parent7ad718cfd64aff6f3492dfb7163628bc100760e2 (diff)
qt4: added postgres, mysql, and sqlite2/3 support.
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> Signed-off-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'recipes/qt4')
-rw-r--r--recipes/qt4/qt4-embedded.inc2
-rw-r--r--recipes/qt4/qt4-x11-free.inc2
-rw-r--r--recipes/qt4/qt4.inc7
3 files changed, 6 insertions, 5 deletions
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-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.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() {