From: Mirko Vogt <mirko@openwrt.org>
Date: Tue, 22 Jun 2010 10:04:25 +0000 (+0000)
Subject: level up qt4 from 4.6.2 to 4.7beta
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=a020427523acbbe1ee6c47da46e6e58d49647c4b

level up qt4 from 4.6.2 to 4.7beta

SVN-Revision: 21874
---

diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile
index 0b487ef35f..e6ee70242c 100644
--- a/Xorg/lib/qt4/Makefile
+++ b/Xorg/lib/qt4/Makefile
@@ -14,8 +14,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt4
-PKG_VERSION:=4.6.2
-PKG_RELEASE:=2
+PKG_VERSION:=4.7.0-beta1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.qt.nokia.com/qt/source
@@ -242,6 +242,8 @@ define Build/Configure
 			-verbose \
 			-$(if $(CONFIG_PACKAGE_qt4-multimedia),multimedia,no-multimedia) \
 			-$(if $(CONFIG_PACKAGE_qt4-audio-backend),audio-backend,no-audio-backend) \
+			-no-mediaservices \
+			-no-media-backend \
 			-$(if $(CONFIG_PACKAGE_qt4-phonon),phonon,no-phonon) \
 			-$(if $(CONFIG_PACKAGE_qt4-phonon-backend),phonon-backend,no-phonon-backend) \
 			-svg \
@@ -253,6 +255,7 @@ define Build/Configure
 			-no-declarative \
 			-no-openssl \
 			-no-nis \
+			$(if $(CONFIG_PACKAGE_qt4-gui),,-no-gui) \
 			-$(if $(CONFIG_PACKAGE_qt4-cups),cups,no-cups) \
 			-no-iconv \
 			-$(if $(CONFIG_PACKAGE_qt4-dbus),dbus,no-dbus) \