qt5: use a common option for JavaScriptCore dependencies

This will be used by other qt packages that contain a copy of
JavaScriptCore.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 0f8901926ba05587125192d1d0f4683cccb4a344..b62a8102e844a887b93347145d76a4265f6877da 100644 (file)
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -1,3 +1,11 @@
+config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+       bool
+       # Javascript engine is only available on certain architectures
+       depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
+       # ARM needs BLX, so v5t+
+       depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
+       default y
+
 comment "Qt5 needs a toolchain w/ wchar, IPv6, threads, C++"
        depends on !BR2_PACKAGE_QT
        depends on !BR2_avr32

diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index a1fb9a310274548e65915b208320620db0294bb3..c5753b19c80f87cc4f910d104cf1a636bb8f4fdb 100644 (file)
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -1,11 +1,3 @@
-config BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
-       bool
-       # Javascript engine is only available on certain architectures
-       depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
-       # ARM needs BLX, so v5t+
-       depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
-       default y
-
 config BR2_PACKAGE_QT5DECLARATIVE
        bool "qt5declarative"
        select BR2_PACKAGE_QT5XMLPATTERNS
@@ -14,7 +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_QT5DECLARATIVE_AVAILABLE
+       depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.
@@ -25,4 +17,4 @@ config BR2_PACKAGE_QT5DECLARATIVE
 
 comment "qt5declarative requires an OpenGL-capable backend"
        depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
-               BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+               BR2_PACKAGE_QT5_JSCORE_AVAILABLE

diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
index 4958586393e4d7980dca22f6754dd7f6e82da043..f4029e9d9d905fba2256750e1ff2e19a373eb4a0 100644 (file)
--- a/package/qt5/qt5graphicaleffects/Config.in
+++ b/package/qt5/qt5graphicaleffects/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
        bool "qt5graphicaleffects"
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5DECLARATIVE
-       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+       depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
        help
@@ -15,4 +15,4 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
 
 comment "qt5graphicaleffects requires an OpenGL-capable backend"
        depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
-               BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+               BR2_PACKAGE_QT5_JSCORE_AVAILABLE

diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
index 62373e446c4605113346e0bde202ca40699a8864..53b7f86a240ca9e8b6be83821293add17be31afd 100644 (file)
--- a/package/qt5/qt5multimedia/Config.in
+++ b/package/qt5/qt5multimedia/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_QT5MULTIMEDIA
        select BR2_PACKAGE_QT5DECLARATIVE
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
-       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+       depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.
@@ -15,4 +15,4 @@ config BR2_PACKAGE_QT5MULTIMEDIA
 
 comment "qt5multimedia requires an OpenGL-capable backend"
        depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
-               BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+               BR2_PACKAGE_QT5_JSCORE_AVAILABLE

diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
index d3c71e3a5268d63166028dbf2e30246a9f844a39..1a0b8bfacf5d093c226c26e34bac15d2902be88d 100644 (file)
--- a/package/qt5/qt5quick1/Config.in
+++ b/package/qt5/qt5quick1/Config.in
@@ -10,7 +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_QT5DECLARATIVE_AVAILABLE
+       depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.
@@ -20,6 +20,6 @@ config BR2_PACKAGE_QT5QUICK1
          http://qt-project.org
 
 comment "qt5quick1 needs a toolchain w/ dynamic library and an OpenGL-capable backend"
-       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+       depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES || \
                BR2_PREFER_STATIC_LIB

diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
index 265132823f7567f8d0e93c87561c722f06a1d6e9..e72f2a4d89986a745f9e11388f7aa6a27c74ce2f 100644 (file)
--- a/package/qt5/qt5quickcontrols/Config.in
+++ b/package/qt5/qt5quickcontrols/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5BASE_NETWORK
        select BR2_PACKAGE_QT5DECLARATIVE
-       depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+       depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
        help
@@ -16,4 +16,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
 
 comment "qt5quickcontrols requires an OpenGL-capable backend"
        depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
-               BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+               BR2_PACKAGE_QT5_JSCORE_AVAILABLE