소스 검색

package/qjson: remove qt4 support

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

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[Arnout: also remove redundant BR2_STATIC_LIBS dependency/comment]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Peter Korsgaard 6 년 전
부모
커밋
c412f25a70
2개의 변경된 파일2개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 6
      package/qjson/Config.in
  2. 1 3
      package/qjson/qjson.mk

+ 1 - 6
package/qjson/Config.in

@@ -1,13 +1,8 @@
 config BR2_PACKAGE_QJSON
 	bool "qjson"
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
 	help
 	  QJson is a Qt-based library that maps JSON data to
 	  QVariant objects and vice versa.
 
 	  http://qjson.sourceforge.net
-
-comment "qjson needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5

+ 1 - 3
package/qjson/qjson.mk

@@ -7,9 +7,7 @@
 QJSON_VERSION = 0.9.0
 QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION))
 QJSON_INSTALL_STAGING = YES
-QJSON_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_QT),qt) \
-	$(if $(BR2_PACKAGE_QT5),qt5base)
+QJSON_DEPENDENCIES = qt5base
 QJSON_LICENSE = LGPL-2.1
 QJSON_LICENSE_FILES = COPYING.lib