[oe-commits] Koen Kooi : qt4: move xmlpatterns to 4.7 build, it breaks 4.6.x

git version control git at git.openembedded.org
Mon Jun 28 09:32:12 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 54c5c004e7affe487218299846f1be16f0cb50ef
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=54c5c004e7affe487218299846f1be16f0cb50ef

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon Jun 28 11:30:35 2010 +0200

qt4: move xmlpatterns to 4.7 build, it breaks 4.6.x

---

 recipes/qt4/qt-4.6.2+4.7.0-beta1.inc |    2 +-
 recipes/qt4/qt4.inc                  |    2 +-
 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 8ac9577..114f3ae 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 13d0561..9210aea 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"
 





More information about the Openembedded-commits mailing list