aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/qt4
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-06-28 11:30:35 +0200
committerKoen Kooi <koen@openembedded.org>2010-06-28 11:31:47 +0200
commit54c5c004e7affe487218299846f1be16f0cb50ef (patch)
treea10e3f3e78edc6f8e38b75d01855ec9b39732f6b /recipes/qt4
parent3249005fd52217a2bc7157e29143cb8c4a909765 (diff)
downloadopenembedded-54c5c004e7affe487218299846f1be16f0cb50ef.tar.gz
openembedded-54c5c004e7affe487218299846f1be16f0cb50ef.tar.bz2
openembedded-54c5c004e7affe487218299846f1be16f0cb50ef.zip
qt4: move xmlpatterns to 4.7 build, it breaks 4.6.x
Diffstat (limited to 'recipes/qt4')
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1.inc2
-rw-r--r--recipes/qt4/qt4.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
index 8ac957720f..114f3ae2ea 100644
--- a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
@@ -45,7 +45,7 @@ do_configure_append() {
}
QT_GLFLAGS ?= ""
-QT_CONFIG_FLAGS += " -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
+QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
do_compile() {
# Fixup missing wsegl header in some SGX SDKs
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 13d0561e9a..9210aeadb9 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -10,7 +10,7 @@ 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 -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql -plugin-sql-sqlite -plugin-sql-sqlite2 \
- -no-pch -qdbus -stl -glib -phonon -webkit -xmlpatterns"
+ -no-pch -qdbus -stl -glib -phonon -webkit"
EXTRA_OEMAKE = "-e"