From: Julien Corjon <corjon.j@ecagroup.com>
Date: Tue, 31 Jan 2017 07:59:06 +0000 (+0100)
Subject: qt5base: conditionally install bundled fonts to target
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=080434f10e5b731ce11ea61a569589fb9f4a5493;p=buildroot.git

qt5base: conditionally install bundled fonts to target

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

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 112259a8b1..2cf0331b04 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -262,12 +262,14 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
 	fi
 endef
 
+ifeq ($(BR2_QT5_VERSION_5_6),y)
 define QT5BASE_INSTALL_TARGET_FONTS
 	if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
 		mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
 		cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
 	fi
 endef
+endif
 
 define QT5BASE_INSTALL_TARGET_EXAMPLES
 	if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \