From: Koen Kooi <koen@openembedded.org>
Date: Thu, 10 Dec 2009 19:00:01 +0000 (+0100)
Subject: qt 4.6.0: fix packaging a bit
X-Git-Tag: Release-2010-05/1~1320
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8424a955b39d55e1f5fc17903507909ba7139dc1;p=openembedded.git

qt 4.6.0: fix packaging a bit

* the uic, moc and rcc tools still need to get packages, but we have package all libs now
---

diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc
index c6694f11ce..97ad6cdd74 100644
--- a/recipes/qt4/qt-4.6.0.inc
+++ b/recipes/qt4/qt-4.6.0.inc
@@ -31,6 +31,11 @@ do_configure_prepend() {
 QT_GLFLAGS ?= ""
 QT_CONFIG_FLAGS += "${QT_GLFLAGS}"
 
+do_compile() {
+    unset CFLAGS CXXFLAGS
+    oe_runmake ${EXTRA_ENV}
+}
+
 do_install_append() {
 	install -d ${D}${bindir}
 	for i in rcc uic moc ; do
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 50dd1d8760..7d600a825c 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -23,7 +23,7 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
 export QT_CONF_PATH="${WORKDIR}/qt.conf"
 
 # Library packages
-QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon"
+QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon QtMultimedia QtOpenVG"
 
 QT_EXTRA_LIBS = "pvrQWSWSEGL"