diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2019-02-06 15:10:55 +0100 |
|---|---|---|
| committer | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2019-02-06 15:43:47 +0100 |
| commit | c412f25a70b20ae755497d4c6fb18ae4633cc857 (patch) | |
| tree | eacfb5f4992de7b36b760fdca00207b34261cdf5 | |
| parent | 122f8cf1cb4a54a2585d7fa022df10ab529e4261 (diff) | |
| download | buildroot-c412f25a70b20ae755497d4c6fb18ae4633cc857.tar.gz buildroot-c412f25a70b20ae755497d4c6fb18ae4633cc857.zip | |
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>
| -rw-r--r-- | package/qjson/Config.in | 7 | ||||
| -rw-r--r-- | package/qjson/qjson.mk | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/package/qjson/Config.in b/package/qjson/Config.in index 5c423bf317..adb06cddc0 100644 --- a/package/qjson/Config.in +++ b/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 diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk index 1777b9454c..718d6622a8 100644 --- a/package/qjson/qjson.mk +++ b/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 |
