jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt5base: conditionally install bundled fonts to target

Browse Source 
qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645

So for Qt Version 5.8.0 this reverts commit
cdfa21b06041eb601e0bea79f2c8f50e9d637384 and part of
186ef9f6f4647ed34b67a3427a5e0e249f0794e7.

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
[Thomas: adjust commit log.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Julien Corjon 2017-01-31 08:59:06 +01:00 committed by Thomas Petazzoni
parent 17fdd42c1a
commit 080434f10e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/qt5/qt5base/qt5base.mk
View File

@ -262,12 +262,14 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
fi fi
endef endef
ifeq ($(BR2_QT5_VERSION_5_6),y)
define QT5BASE_INSTALL_TARGET_FONTS define QT5BASE_INSTALL_TARGET_FONTS
if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \ cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
fi fi
endef endef
endif
define QT5BASE_INSTALL_TARGET_EXAMPLES define QT5BASE_INSTALL_TARGET_EXAMPLES
if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \ if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \