Commit b8eaeaec authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

qjson: allow building with Qt5 



Since commit 18714011 ("qjson: bump
version"), qjson can be built either against Qt4 or Qt5. This commit
therefore allows this package to be selected when Qt5 is enabled.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent ff8c746a

package/qjson/Config.in

+1 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_QJSON

	bool "qjson"

	depends on BR2_PACKAGE_QT

	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5

	help

	  QJson is a Qt-based library that maps JSON data to

	  QVariant objects and vice versa.

package/qjson/qjson.mk

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ 
QJSON_VERSION = ba273682a9d33a7b3090e74f4742b5f3bf6c9b02

QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION))

QJSON_INSTALL_STAGING = YES

QJSON_DEPENDENCIES = qt

QJSON_DEPENDENCIES = \

	$(if $(BR2_PACKAGE_QT),qt) \

	$(if $(BR2_PACKAGE_QT5),qt5base)

QJSON_LICENSE = LGPLv2.1

QJSON_LICENSE_FILES = COPYING.lib