gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qt5declarative: add an option for quick module 

With this change, qt5declarative can be built without OpenGL.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Fatih Aşıcı 2014-07-19 20:33:25 +03:00 committed by Thomas Petazzoni
parent c07552996f
commit 984c834e68
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/qt5/qt5declarative/Config.in
View File

@ -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

14
package/qt5/qt5declarative/qt5declarative.mk
View File

@ -35,14 +35,22 @@ 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
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(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
cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin
cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr