gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qjson: allow building with Qt5 

Since commit 18714011b2 ("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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2014-11-01 23:15:10 +01:00 committed by Peter Korsgaard
parent ff8c746aba
commit b8eaeaec8c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/qjson/Config.in
View File

@ -1,6 +1,6 @@
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.

4
package/qjson/qjson.mk
View File

@ -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