diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-21 12:35:41 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-21 21:52:58 +0200 |
| commit | c9ffed63bca0a495d2372c2abe5fd6f29c3b7b15 (patch) | |
| tree | 626a5a07a16be59f92ae243c576d62f91367aa4a /rules/qt4.in | |
| parent | 8064059fd8eb34c09307913b6c7ccfcb2b4a8379 (diff) | |
| download | ptxdist-c9ffed63bca0a495d2372c2abe5fd6f29c3b7b15.tar.gz ptxdist-c9ffed63bca0a495d2372c2abe5fd6f29c3b7b15.tar.xz | |
[qt4] version bump 4.5.3 -> 4.6.3
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/qt4.in')
| -rw-r--r-- | rules/qt4.in | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/rules/qt4.in b/rules/qt4.in index 13cd58512..ca681ea49 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -14,6 +14,7 @@ menuconfig QT4 select GSTREAMER if QT4_BUILD_PHONON select GST_PLUGINS_BASE if QT4_BUILD_PHONON select OPENSSL if QT4_OPENSSL + select ALSA_LIB if QT4_BUILD_MULTIMEDIA # libsvga is currently not in ptxdist # select LIBSVGA if QT4_GFX_SVGA_PLUGIN prompt "Qt Embedded " @@ -282,27 +283,11 @@ config QT4_KBD_TTY help Generic console (tty) driver -config QT4_KBD_USB +config QT4_KBD_INPUT bool - prompt "USB" + prompt "Linux Input" help - Generic usb keyboard driver - -config QT4_KBD_SL5000 - bool - prompt "SL5000 [BROKEN]" - # needs asm/sharp_char.h - depends on BROKEN - -config QT4_KBD_YOPY - bool - prompt "Yopy [BROKEN]" - # needs linux/yopy_button.h - depends on BROKEN - -config QT4_KBD_VR41XX - bool - prompt "Vr41XX" + Generic Linux Input driver config QT4_KBD_QVFB bool @@ -321,22 +306,14 @@ config QT4_MOUSE_PC Generic driver for the MouseMan, IntelliMouse, Microsoft and MouseSystems protocols. -config QT4_MOUSE_BUS +config QT4_MOUSE_INPUT bool - prompt "Bus" + prompt "Linux Input" config QT4_MOUSE_LINUXTP bool prompt "Linux Touch Panel" -config QT4_MOUSE_YOPY - bool - prompt "Yopy" - -config QT4_MOUSE_VR41XX - bool - prompt "NEC Vr41XX" - config QT4_MOUSE_TSLIB bool prompt "Tslib" @@ -538,7 +515,6 @@ config QT4_GLIB config QT4_OPENSSL bool prompt "openssl support" - depends on BROKEN help Add Qt support for openssl. @@ -685,6 +661,16 @@ config QT4_BUILD_QTXMLPATTERNS help XQuery 1.0 and XPath 2.0 support for Qt +config QT4_BUILD_MULTIMEDIA + bool + select QT4_BUILD_GUI + select QT4_BUILD_NETWORK + prompt "Multimedia" + help + The Multimedia API provides media playback and playlist support for + Qt Applications. Play music and movies through a single interface + with selectable output for movies to widgets or graphics view. + config QT4_BUILD_PHONON bool select QT4_BUILD_GUI |