summaryrefslogtreecommitdiff
path: root/package/qwt
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-11-01 23:15:08 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-11-03 23:05:42 +0100
commit699d1e75cfa1597a030d89abdf9376d2df2c3d6e (patch)
treee290fa33248984deefd22301848ee2b5b094becf /package/qwt
parent1e5b076fe3683bd83993497383a7a8bce872266f (diff)
package: prepare to support modules that work with Qt or Qt5
Currently, all the Qt external modules (qtuio, qjson, etc.) can only be compiled against Qt4. However, some of them (qjson, qextserialport at least) can compile with either Qt4 or Qt5. Therefore, this commit adjusts the Config.in logic to make it possible for certain modules to be selected with either Qt4 or Qt5. We use the same approach as the one of for Python 2 vs. Python 3 modules: - in package/Config.in, the package Config.in files are included either if BR2_PACKAGE_QT or BR2_PACKAGE_QT5 are enabled. - each individual package is then responsible for having a dependency on either BR2_PACKAGE_QT, or BR2_PACKAGE_QT5 or both depending on what they support. In this commit, we add a dependency on BR2_PACKAGE_QT to all packages, since for now, they only support Qt4. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qwt')
-rw-r--r--package/qwt/Config.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 7718b594a..8c7bc561d 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_QWT
bool "qwt"
+ depends on BR2_PACKAGE_QT
depends on BR2_PACKAGE_QT_GUI_MODULE
help
Qwt is a graphics extension to the Qt GUI application
@@ -25,4 +26,5 @@ config BR2_PACKAGE_QWT_OPENGL
endif
comment "qwt depends on QT gui module"
+ depends on BR2_PACKAGE_QT
depends on !BR2_PACKAGE_QT_GUI_MODULE