diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig index 7b6d426003..920789530c 100644 --- a/configs/atstk100x_defconfig +++ b/configs/atstk100x_defconfig @@ -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 diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig index f444951ae2..fcece77b04 100644 --- a/configs/v100sc2_defconfig +++ b/configs/v100sc2_defconfig @@ -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 diff --git a/package/qt/Config.in b/package/qt/Config.in index b7fe0f9393..d25ebf94c2 100644 --- a/package/qt/Config.in +++ b/package/qt/Config.in @@ -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 diff --git a/package/qt/qt.mk b/package/qt/qt.mk index ae03fa6843..0bbf64405c 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -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