Преглед на файлове

qt: tweak gui kconfig

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard преди 15 години
родител
ревизия
518804f35a
променени са 2 файла, в които са добавени 4 реда и са изтрити 8 реда
  1. 1 1
      CHANGES
  2. 3 7
      package/qt/Config.in

+ 1 - 1
CHANGES

@@ -4,7 +4,7 @@
 
 
 	Updated/fixed packages: autoconf, bind, binutils, busybox,
 	Updated/fixed packages: autoconf, bind, binutils, busybox,
 	directfb, gst-plugins-bad, iw, libfuse, libpcap, lighttpd,
 	directfb, gst-plugins-bad, iw, libfuse, libpcap, lighttpd,
-	mesa, mtd-utils, pcre, sshfs, tremor, usbutils
+	mesa, mtd-utils, pcre, qt, sshfs, tremor, usbutils
 
 
 	Issues resolved (http://bugs.uclibc.org):
 	Issues resolved (http://bugs.uclibc.org):
 
 

+ 3 - 7
package/qt/Config.in

@@ -62,7 +62,7 @@ config BR2_PACKAGE_QT_GUI_MODULE
 	select BR2_PACKAGE_QT_NETWORK
 	select BR2_PACKAGE_QT_NETWORK
 	default y
 	default y
 	help
 	help
-	  Turns on support to Gui applications. If your board don't have
+	  Turns on support for Gui applications. If your board doesn't have
 	  video output, or you don't require Qt GUI, say n.
 	  video output, or you don't require Qt GUI, say n.
 
 
 if BR2_PACKAGE_QT_GUI_MODULE
 if BR2_PACKAGE_QT_GUI_MODULE
@@ -100,23 +100,19 @@ config BR2_PACKAGE_QT_PIXEL_DEPTH_32
 	default y
 	default y
 
 
 endmenu
 endmenu
-endif
 
 
 config BR2_PACKAGE_QT_GIF
 config BR2_PACKAGE_QT_GIF
 	bool "Enable GIF support"
 	bool "Enable GIF support"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
 	help
 	help
 	  This compiles and installs the plugin for GIF reading support.
 	  This compiles and installs the plugin for GIF reading support.
 
 
 config BR2_PACKAGE_QT_LIBMNG
 config BR2_PACKAGE_QT_LIBMNG
 	bool "Enable libmng support"
 	bool "Enable libmng support"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
 	help
 	help
 	  This compiles and installs the plugin for MNG support.
 	  This compiles and installs the plugin for MNG support.
 
 
 choice
 choice
 	prompt "JPEG support"
 	prompt "JPEG support"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
 	default BR2_PACKAGE_QT_NOJPEG
 	default BR2_PACKAGE_QT_NOJPEG
 	help
 	help
 	  Select libjpeg support.
 	  Select libjpeg support.
@@ -140,7 +136,6 @@ endchoice
 
 
 choice
 choice
 	prompt "PNG support"
 	prompt "PNG support"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
 	default BR2_PACKAGE_QT_NOPNG
 	default BR2_PACKAGE_QT_NOPNG
 	help
 	help
 	  Select which library to use if PNG support should be enabled.
 	  Select which library to use if PNG support should be enabled.
@@ -158,7 +153,6 @@ endchoice
 
 
 choice
 choice
 	prompt "TIFF support"
 	prompt "TIFF support"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
 	default BR2_PACKAGE_QT_NOTIFF
 	default BR2_PACKAGE_QT_NOTIFF
 	help
 	help
 	  Select which library to use if TIFF support should be enabled.
 	  Select which library to use if TIFF support should be enabled.
@@ -174,6 +168,8 @@ config BR2_PACKAGE_QT_QTTIFF
 	bool "Use Qt bundled libtiff"
 	bool "Use Qt bundled libtiff"
 endchoice
 endchoice
 
 
+endif # BR2_PACKAGE_QT_GUI_MODULE
+
 choice
 choice
 	prompt "zlib support"
 	prompt "zlib support"
 	default BR2_PACKAGE_QT_QTZLIB
 	default BR2_PACKAGE_QT_QTZLIB