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>

diff --git a/package/Config.in b/package/Config.in
index 3b3c372a14279f13cf001fe77a93338de5e41b28..28cf70323aa1cfe30ab35c28af383d83a23b982a 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -223,8 +223,8 @@ endif
 comment "Other GUIs"
        source "package/efl/Config.in"
        source "package/qt/Config.in"
-
-if BR2_PACKAGE_QT
+       source "package/qt5/Config.in"
+if BR2_PACKAGE_QT || BR2_PACKAGE_QT5
 comment "QT libraries and helper libraries"
        source "package/grantlee/Config.in"
        source "package/qextserialport/Config.in"
@@ -232,8 +232,6 @@ comment "QT libraries and helper libraries"
        source "package/qtuio/Config.in"
        source "package/qwt/Config.in"
 endif
-
-       source "package/qt5/Config.in"
        source "package/weston/Config.in"
        source "package/x11r7/Config.in"
 

diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in
index 09ec70c0181cdc533caa2e9f13c61ef8364ae038..ce1342c1e8b914c9b6d18fbce3e4cbef0862a54c 100644 (file)
--- a/package/grantlee/Config.in
+++ b/package/grantlee/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GRANTLEE
        bool "grantlee"
        depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
+       depends on BR2_PACKAGE_QT
        select BR2_PACKAGE_QT_STL
        select BR2_PACKAGE_QT_SCRIPT
        select BR2_PACKAGE_QT_GUI_MODULE

diff --git a/package/qjson/Config.in b/package/qjson/Config.in
index c15b12fdabd69e7b2c2b5b62a6eb52961dc8f185..2dc2cc405e9f76016f54d90d8ff03a4515a605ad 100644 (file)
--- a/package/qjson/Config.in
+++ b/package/qjson/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_QJSON
        bool "qjson"
+       depends on BR2_PACKAGE_QT
        help
          QJson is a Qt-based library that maps JSON data to
          QVariant objects and vice versa.

diff --git a/package/qtuio/Config.in b/package/qtuio/Config.in
index f3f5e3c3971ceb7541c93fe86b9308716db210c3..f46f1dd407541f390fb490ddf1dcfce5f0b92465 100644 (file)
--- a/package/qtuio/Config.in
+++ b/package/qtuio/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_QTUIO
        bool "qtuio"
+       depends on BR2_PACKAGE_QT
        depends on BR2_PACKAGE_QT_GUI_MODULE
        help
          Implementation of an interface connecting TUIO messages
@@ -17,4 +18,5 @@ config BR2_QTUIO_EXAMPLES
 endif
 
 comment "qtuio depends on QT gui module"
+       depends on BR2_PACKAGE_QT
        depends on !BR2_PACKAGE_QT_GUI_MODULE

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 7718b594ac608a0a360bdc41fdb09821ae9cdeb4..8c7bc561dc63c9a03c82e826ed32527e8981d72d 100644 (file)
--- 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