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

qt5declarative: add an option for quick module 



With this change, qt5declarative can be built without OpenGL.

Signed-off-by: default avatarFatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent c0755299

package/qt5/qt5declarative/Config.in

+11 −6
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ config BR2_PACKAGE_QT5DECLARATIVE 
	select BR2_PACKAGE_QT5XMLPATTERNS

	select BR2_PACKAGE_QT5BASE

	select BR2_PACKAGE_QT5BASE_GUI

	select BR2_PACKAGE_QT5BASE_EGLFS

	depends on BR2_PACKAGE_HAS_LIBEGL

	depends on BR2_PACKAGE_HAS_LIBGLES

	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE

	help

	  Qt is a cross-platform application and UI framework for
@@ -15,6 +12,14 @@ config BR2_PACKAGE_QT5DECLARATIVE 


	  http://qt-project.org



comment "qt5declarative requires an OpenGL-capable backend"

	depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \

		BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 
if BR2_PACKAGE_QT5DECLARATIVE



comment "quick module needs an OpenGL-capable backend"

	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE



config BR2_PACKAGE_QT5DECLARATIVE_QUICK

	bool "quick module"

	select BR2_PACKAGE_QT5BASE_OPENGL

	depends on BR2_PACKAGE_QT5_GL_AVAILABLE



endif

package/qt5/qt5declarative/qt5declarative.mk

+10 −2
Original line number Diff line number Diff line
@@ -35,12 +35,20 @@ define QT5DECLARATIVE_INSTALL_STAGING_CMDS 
endef



ifeq ($(BR2_PREFER_STATIC_LIB),)

define QT5DECLARATIVE_INSTALL_TARGET_LIBS

	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib



ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)

define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS

	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib

	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins

endef

endif



define QT5DECLARATIVE_INSTALL_TARGET_LIBS

	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib

	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins

	$(QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS)

endef



endif



define QT5DECLARATIVE_INSTALL_TARGET_CMDS