diff --git a/Kconfig b/Kconfig index ed6406b531..49b2ae7f88 100644 --- a/Kconfig +++ b/Kconfig @@ -1981,7 +1981,6 @@ config LV_USE_GSTREAMER config LV_USE_IMAGE bool "Image" - select LV_USE_LABEL default y config LV_USE_IMAGEBUTTON diff --git a/include/lvgl/config/lv_conf_internal.h b/include/lvgl/config/lv_conf_internal.h index 3c95705329..37e734940d 100644 --- a/include/lvgl/config/lv_conf_internal.h +++ b/include/lvgl/config/lv_conf_internal.h @@ -5226,8 +5226,8 @@ LV_EXPORT_CONST_INT(LV_DRAW_BUF_ALIGN); #error "LV_USE_KEYBOARD must be enabled: Kconfig selects it from LV_USE_IME_PINYIN" #endif -#if (LV_USE_DROPDOWN || LV_USE_IMAGE || LV_USE_ROLLER || LV_USE_TEXTAREA) && !LV_USE_LABEL - #error "LV_USE_LABEL must be enabled: Kconfig selects it from LV_USE_DROPDOWN || LV_USE_IMAGE || LV_USE_ROLLER || LV_USE_TEXTAREA" +#if (LV_USE_DROPDOWN || LV_USE_ROLLER || LV_USE_TEXTAREA) && !LV_USE_LABEL + #error "LV_USE_LABEL must be enabled: Kconfig selects it from LV_USE_DROPDOWN || LV_USE_ROLLER || LV_USE_TEXTAREA" #endif #if LV_USE_LOTTIE && !(LV_DRAW_HAS_VECTOR_SUPPORT && LV_USE_THORVG) diff --git a/include/lvgl/widgets/lv_image.h b/include/lvgl/widgets/lv_image.h index 0e0a4f26f8..0fed39e20f 100644 --- a/include/lvgl/widgets/lv_image.h +++ b/include/lvgl/widgets/lv_image.h @@ -17,11 +17,6 @@ extern "C" { #if LV_USE_IMAGE != 0 -/*Testing of dependencies*/ -#if LV_USE_LABEL == 0 -#error "lv_img: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" -#endif - #include "../core/lv_obj.h" #include "../fs/lv_fs.h" #include "../draw/lv_draw.h" diff --git a/lv_conf_template.h b/lv_conf_template.h index 8f7643232c..e3962ea3dc 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1295,10 +1295,7 @@ */ #define LV_USE_GSTREAMER 0 -/** Image - * - * Enable: LV_USE_LABEL - */ +/** Image */ #define LV_USE_IMAGE 1 /** Image button */ diff --git a/src/widgets/Kconfig b/src/widgets/Kconfig index 1c565e91df..16294c150f 100644 --- a/src/widgets/Kconfig +++ b/src/widgets/Kconfig @@ -131,7 +131,6 @@ config LV_USE_GSTREAMER config LV_USE_IMAGE bool "Image" - select LV_USE_LABEL default y config LV_USE_IMAGEBUTTON