Commit d6d7f13c authored by Michael Roth's avatar Michael Roth Committed by Peter Korsgaard
Browse files

qt: remove Kconfig option to enable all pixel depths 



The Kconfig menu "Pixel depths" of Qt provides a list with all
selectable pixel depths and additionally the option "all".

When "all" is selected, the list with all available pixel depths
disappears.

Because this disappearing of available pixel depths makes no sense
under usability aspects, simply remove the option "all".

The user could enable all available pixel depths by selecting each
individual depth anyway. So no functionality is lost.

Signed-off-by: default avatarMichael Roth <mroth@nessie.de>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 82f1ccf4

configs/atstk100x_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -702,7 +702,6 @@ BR2_PACKAGE_QT_GUI_MODULE=y 
#

# Deselecting each option leads to Qt's default (8,16,32)

#

# BR2_PACKAGE_QT_PIXEL_DEPTH_ALL is not set

# BR2_PACKAGE_QT_PIXEL_DEPTH_1 is not set

# BR2_PACKAGE_QT_PIXEL_DEPTH_4 is not set

BR2_PACKAGE_QT_PIXEL_DEPTH_8=y

configs/v100sc2_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -550,7 +550,9 @@ BR2_PACKAGE_QT_LICENSE_TYPE_GPL=y 
# BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL is not set

BR2_PACKAGE_QT_GPL_LICENSE_APPROVED=y

# BR2_PACKAGE_QT_QT3SUPPORT is not set

BR2_PACKAGE_QT_DEPTHS="-depths 24,16,8"

BR2_PACKAGE_QT_PIXEL_DEPTH_8=y

BR2_PACKAGE_QT_PIXEL_DEPTH_16=y

BR2_PACKAGE_QT_PIXEL_DEPTH_24=y

BR2_PACKAGE_QT_GIF=y

# BR2_PACKAGE_QT_LIBMNG is not set

# BR2_PACKAGE_QT_NOJPEG is not set

package/qt/Config.in

+0 −6
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ if BR2_PACKAGE_QT_GUI_MODULE 
menu "Pixel depths"

comment "Deselecting each option leads to Qt's default (8,16,32)"



config BR2_PACKAGE_QT_PIXEL_DEPTH_ALL

	bool "All supported depths"



if !BR2_PACKAGE_QT_PIXEL_DEPTH_ALL



config BR2_PACKAGE_QT_PIXEL_DEPTH_1

	bool "1 bpp, black/white"
@@ -122,7 +117,6 @@ config BR2_PACKAGE_QT_PIXEL_DEPTH_32 
	bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"

	default y



endif

endmenu

endif

package/qt/qt.mk

+1 −4
Original line number Diff line number Diff line
@@ -62,9 +62,7 @@ endif 




### Pixel depths

ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_ALL),y)

QT_PIXEL_DEPTHS = all

else

QT_PIXEL_DEPTHS := # empty

ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)

QT_PIXEL_DEPTHS += 1

endif
@@ -92,7 +90,6 @@ endif 
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_32),y)

QT_PIXEL_DEPTHS += 32

endif

endif

ifneq ($(QT_PIXEL_DEPTHS),)

QT_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS)))

endif