package/quazip: remove qt4 support

Qt4 support is about to be dropped, so remove the support from quazip as
well.

Also add an explicit depends on for qt5 for consistency with other packages.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/quazip/Config.in b/package/quazip/Config.in
index 83537d461346e928ca448e79bff7c0ad3f068672..e980297558708e4c59623791f961e7a6cdf9eb84 100644 (file)
--- a/package/quazip/Config.in
+++ b/package/quazip/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_QUAZIP
        bool "quazip"
+       depends on BR2_PACKAGE_QT5
        select BR2_PACKAGE_ZLIB
        help
          QuaZIP is a simple C++ wrapper over Gilles Vollant's

diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk
index 872340ab4045308ba3a2bd712b48286227f26d9e..aba82745062b66d6745320c92a8ccaafa7d961c0 100644 (file)
--- a/package/quazip/quazip.mk
+++ b/package/quazip/quazip.mk
@@ -9,19 +9,12 @@ QUAZIP_SITE = $(call github,stachenov,quazip,$(QUAZIP_VERSION))
 QUAZIP_INSTALL_STAGING = YES
 QUAZIP_DEPENDENCIES = \
        zlib \
-       $(if $(BR2_PACKAGE_QT),qt) \
-       $(if $(BR2_PACKAGE_QT5),qt5base)
+       qt5base
 QUAZIP_LICENSE = LGPL-2.1
 QUAZIP_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PACKAGE_QT5),y)
-QUAZIP_QMAKE = $(QT5_QMAKE)
-else
-QUAZIP_QMAKE = $(QT_QMAKE)
-endif
-
 define QUAZIP_CONFIGURE_CMDS
-       (cd $(@D); $(TARGET_MAKE_ENV) $(QUAZIP_QMAKE) PREFIX=/usr)
+       (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr)
 endef
 
 define QUAZIP_BUILD_CMDS