diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-11-01 23:15:10 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-11-03 23:06:12 +0100 |
| commit | b8eaeaec8cf4d8bdfbea84d35fbd1e57dfc4ca45 (patch) | |
| tree | 9b1b090356a6b2b71220ff316d6552a490efbe71 | |
| parent | ff8c746aba02c4987326ed39c8887e4f4500c412 (diff) | |
| download | buildroot-b8eaeaec8cf4d8bdfbea84d35fbd1e57dfc4ca45.tar.gz buildroot-b8eaeaec8cf4d8bdfbea84d35fbd1e57dfc4ca45.zip | |
qjson: allow building with Qt5
Since commit 18714011b231fc326c96782134fbea778ab6a94d ("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>
| -rw-r--r-- | package/qjson/Config.in | 2 | ||||
| -rw-r--r-- | package/qjson/qjson.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/package/qjson/Config.in b/package/qjson/Config.in index 2dc2cc405e..0f0cc0983e 100644 --- a/package/qjson/Config.in +++ b/package/qjson/Config.in @@ -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. diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk index 17f2d00317..6a1661733d 100644 --- a/package/qjson/qjson.mk +++ b/package/qjson/qjson.mk @@ -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 |
