From 6ca42939d6debc645fbfb431b99ace4b93b5cc0d Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Wed, 9 Aug 2023 19:15:01 +0200 Subject: [PATCH] package/quazip: enable for qt6 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/quazip/Config.in | 3 ++- package/quazip/quazip.mk | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/quazip/Config.in b/package/quazip/Config.in index bba5eddf3d..4c7a187571 100644 --- a/package/quazip/Config.in +++ b/package/quazip/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_QUAZIP bool "quazip" - depends on BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB + select BR2_PACKAGE_QT6CORE5COMPAT if BR2_PACKAGE_QT6 help QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that can be used to access ZIP diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index bf3b844624..665058d890 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -7,9 +7,15 @@ QUAZIP_VERSION = 1.4 QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES -QUAZIP_DEPENDENCIES = \ - zlib \ - qt5base +QUAZIP_DEPENDENCIES = zlib + +ifeq ($(BR2_PACKAGE_QT5BASE),y) +QUAZIP_DEPENDENCIES += qt5base +endif +ifeq ($(BR2_PACKAGE_QT6BASE),y) +QUAZIP_DEPENDENCIES += qt6base qt6core5compat +endif + QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING QUAZIP_CPE_ID_VENDOR = quazip_project