mirror of
https://github.com/lvgl/lvgl.git
synced 2026-08-17 18:22:42 +08:00
build(widgets/image): remove label dependency (#10464)
This commit is contained in:
@@ -1981,7 +1981,6 @@ config LV_USE_GSTREAMER
|
||||
|
||||
config LV_USE_IMAGE
|
||||
bool "Image"
|
||||
select LV_USE_LABEL
|
||||
default y
|
||||
|
||||
config LV_USE_IMAGEBUTTON
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
+1
-4
@@ -1295,10 +1295,7 @@
|
||||
*/
|
||||
#define LV_USE_GSTREAMER 0
|
||||
|
||||
/** Image
|
||||
*
|
||||
* Enable: LV_USE_LABEL
|
||||
*/
|
||||
/** Image */
|
||||
#define LV_USE_IMAGE 1
|
||||
|
||||
/** Image button */
|
||||
|
||||
@@ -131,7 +131,6 @@ config LV_USE_GSTREAMER
|
||||
|
||||
config LV_USE_IMAGE
|
||||
bool "Image"
|
||||
select LV_USE_LABEL
|
||||
default y
|
||||
|
||||
config LV_USE_IMAGEBUTTON
|
||||
|
||||
Reference in New Issue
Block a user