Commit d5a3fa68 authored by Frederik Vannoote's avatar Frederik Vannoote Committed by Peter Korsgaard
Browse files

qt: bump version 



qt 4.6.x has a number of new configure options, and needs a patch to
work on uClibc.

Signed-off-by: default avatarFrederik Vannoote <frederik.vannoote@barco.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent d6a0d6f3

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
	Updated/fixed packages: busybox, dnsmasq, dosfstools, e2fsprogs,

	freetype, iperf, iptables, iw, less, libgcrypt, libglib2, libpng,

	libxml2, mdadm, memstat, mtd-utils, nano, openssl, php, pppd,

	radvd, setserial, squashfs, wget, xlib_libX11, xlib_libXfont

	qt, radvd, setserial, squashfs, wget, xlib_libX11, xlib_libXfont



	Issues resolved (http://bugs.uclibc.org):

package/qt/Config.gfx.in

+7 −0
Original line number Diff line number Diff line
@@ -16,4 +16,11 @@ config BR2_PACKAGE_QT_GFX_VNC 
config BR2_PACKAGE_QT_GFX_MULTISCREEN

	bool "multiscreen"



comment "directfb Qt driver not available (need directfb)"

	depends on !BR2_PACKAGE_DIRECTFB



config BR2_PACKAGE_QT_GFX_DIRECTFB

	depends on BR2_PACKAGE_DIRECTFB

	bool "directFB"



endmenu

package/qt/Config.in

+35 −0
Original line number Diff line number Diff line
@@ -270,6 +270,22 @@ config BR2_PACKAGE_QT_PHONON 
	  formats can be configured at the GStreamer package.

	  If unsure, say n.



config BR2_PACKAGE_QT_PHONON_BACKEND

	bool "Phonon Module Backend"

	depends on BR2_PACKAGE_QT_PHONON

	help

	  Build the platform Phonon plugin.

	  If unsure, say n.



comment "Qt DBbus module not available (need dbus)"

	depends on !BR2_PACKAGE_DBUS



config BR2_PACKAGE_QT_DBUS

	bool "DBus Module"

	depends on BR2_PACKAGE_DBUS

	help

	  Build the Qt DBus module.



config BR2_PACKAGE_QT_XML

	bool "XML Module"

	default y
@@ -283,6 +299,17 @@ config BR2_PACKAGE_QT_XMLPATTERNS 
	  Build QtXmlPatterns module.

	  If unsure, say n



config BR2_PACKAGE_QT_MULTIMEDIA

	bool "Multimedia Module"

	help

	  Build QtMultimedia module.



config BR2_PACKAGE_QT_AUDIO_BACKEND

	bool "QtMultimedia Audio backend"

	depends on BR2_PACKAGE_QT_MULTIMEDIA

	help

	  Build the platform audio backend into QtMultimedia if available



config BR2_PACKAGE_QT_SVG

	bool "SVG Module"

	help
@@ -299,10 +326,17 @@ config BR2_PACKAGE_QT_NETWORK 
config BR2_PACKAGE_QT_WEBKIT

	bool "WebKit Module"

	depends on BR2_PACKAGE_QT_NETWORK

	select BR2_PACKAGE_QT_JAVASCRIPTCORE

	help

	  Build the WebKit module.

	  If unsure, say n.



config BR2_PACKAGE_QT_JAVASCRIPTCORE

	bool "JavaScriptCore JIT compiler"

	help

	  Build the JavaScriptCore JIT compiler

	  If unsure, say y



config BR2_PACKAGE_QT_STL

	bool "STL support"

	help
@@ -322,6 +356,7 @@ config BR2_PACKAGE_QT_OPENSSL 
config BR2_PACKAGE_QT_SCRIPT

	bool "Script Module"

	default y

	select BR2_PACKAGE_QT_JAVASCRIPTCORE

	help

	  Build the Qt Script module.

	  if unsure, say y.

package/qt/Config.keyboard.in

+2 −11
Original line number Diff line number Diff line
@@ -3,17 +3,8 @@ menu "Keyboard drivers" 
config BR2_PACKAGE_QT_KEYBOARD_TTY

	bool "tty"



config BR2_PACKAGE_QT_KEYBOARD_USB

	bool "usb"



config BR2_PACKAGE_QT_KEYBOARD_SL5000

	bool "sl5000"



config BR2_PACKAGE_QT_KEYBOARD_YOPY

	bool "yopy"



config BR2_PACKAGE_QT_KEYBOARD_VR41XX

	bool "vr41xx"

config BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT

	bool "linux input"



config BR2_PACKAGE_QT_KEYBOARD_QVFB

	bool "qvfb"

package/qt/Config.mouse.in

+2 −8
Original line number Diff line number Diff line
@@ -3,17 +3,11 @@ menu "Mouse drivers" 
config BR2_PACKAGE_QT_MOUSE_PC

	bool "pc"



config BR2_PACKAGE_QT_MOUSE_BUS

	bool "bus"



config BR2_PACKAGE_QT_MOUSE_LINUXTP

	bool "linuxtp"



config BR2_PACKAGE_QT_MOUSE_YOPY

	bool "yopy"



config BR2_PACKAGE_QT_MOUSE_VR41XX

	bool "vr41xx"

config BR2_PACKAGE_QT_MOUSE_LINUXINPUT

	bool "linux input"



config BR2_PACKAGE_QT_MOUSE_TSLIB

	bool "tslib"