Commit 09f204a9 authored by Fatih Aşıcı's avatar Fatih Aşıcı Committed by Thomas Petazzoni
Browse files

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: default avatarFatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 5d24fd03

package/qt5/Config.in

+8 −0
Original line number Diff line number Diff line 
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

package/qt5/qt5declarative/Config.in

+2 −10
Original line number Diff line number Diff line 
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

package/qt5/qt5graphicaleffects/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -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

package/qt5/qt5multimedia/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -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

package/qt5/qt5quick1/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -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