diff options
| -rw-r--r-- | package/qt5/qt5declarative/Config.in | 4 | ||||
| -rw-r--r-- | package/qt5/qt5graphicaleffects/Config.in | 5 | ||||
| -rw-r--r-- | package/qt5/qt5jsbackend/Config.in | 7 | ||||
| -rw-r--r-- | package/qt5/qt5multimedia/Config.in | 5 | ||||
| -rw-r--r-- | package/qt5/qt5quick1/Config.in | 4 |
5 files changed, 21 insertions, 4 deletions
diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index f862b94bf..93328650d 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5BASE_EGLFS depends on BR2_PACKAGE_HAS_OPENGL_EGL depends on BR2_PACKAGE_HAS_OPENGL_ES + depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE help Qt is a cross-platform application and UI framework for developers using C++. @@ -15,4 +16,5 @@ config BR2_PACKAGE_QT5DECLARATIVE http://qt-project.org comment "qt5declarative requires an OpenGL-capable backend" - depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES + depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \ + BR2_PACKAGE_QT5JSBACKEND_AVAILABLE diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in index 9a32bc72f..ed0454ad6 100644 --- a/package/qt5/qt5graphicaleffects/Config.in +++ b/package/qt5/qt5graphicaleffects/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS bool "qt5graphicaleffects" select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5DECLARATIVE + # qt5declarative -> qt5jsbackend + depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE depends on BR2_PACKAGE_HAS_OPENGL_EGL depends on BR2_PACKAGE_HAS_OPENGL_ES help @@ -13,4 +15,5 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS http://qt-project.org comment "qt5graphicaleffects requires an OpenGL-capable backend" - depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES + depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \ + BR2_PACKAGE_QT5JSBACKEND_AVAILABLE diff --git a/package/qt5/qt5jsbackend/Config.in b/package/qt5/qt5jsbackend/Config.in index 89d506771..2f5ac1ff5 100644 --- a/package/qt5/qt5jsbackend/Config.in +++ b/package/qt5/qt5jsbackend/Config.in @@ -1,6 +1,13 @@ +config BR2_PACKAGE_QT5JSBACKEND_AVAILABLE + bool + # v8 is only available on certain architectures + depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel + default y + config BR2_PACKAGE_QT5JSBACKEND bool "qt5jsbackend" select BR2_PACKAGE_QT5BASE + depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in index fd36672f0..080cba22c 100644 --- a/package/qt5/qt5multimedia/Config.in +++ b/package/qt5/qt5multimedia/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_QT5MULTIMEDIA select BR2_PACKAGE_QT5DECLARATIVE depends on BR2_PACKAGE_HAS_OPENGL_EGL depends on BR2_PACKAGE_HAS_OPENGL_ES + # qt5declarative -> qt5jsbackend + depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE help Qt is a cross-platform application and UI framework for developers using C++. @@ -13,4 +15,5 @@ config BR2_PACKAGE_QT5MULTIMEDIA http://qt-project.org comment "qt5multimedia requires an OpenGL-capable backend" - depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES + depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \ + BR2_PACKAGE_QT5JSBACKEND_AVAILABLE diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in index 99fd5a4d8..65b1f621a 100644 --- a/package/qt5/qt5quick1/Config.in +++ b/package/qt5/qt5quick1/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_QT5QUICK1 depends on !BR2_PREFER_STATIC_LIB depends on BR2_PACKAGE_HAS_OPENGL_EGL depends on BR2_PACKAGE_HAS_OPENGL_ES + depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE help Qt is a cross-platform application and UI framework for developers using C++. @@ -19,4 +20,5 @@ config BR2_PACKAGE_QT5QUICK1 http://qt-project.org comment "qt5quick1 requires an OpenGL-capable backend" - depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES + depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \ + BR2_PACKAGE_QT5JSBACKEND_AVAILABLE |