summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roth <mroth@nessie.de>2009-10-07 09:20:38 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2009-10-09 12:53:06 (GMT)
commitf9854762255617f49b08e5d5a87f76638b9a5701 (patch)
tree327258bcd549b1b7913be954bdb99dcaa0eb2711
parentf9e208866bbed8a75de881b555760b095ced4011 (diff)
downloadbuildroot-f9854762255617f49b08e5d5a87f76638b9a5701.tar.gz
buildroot-f9854762255617f49b08e5d5a87f76638b9a5701.tar.bz2
qt: make sure to install all Qt-fonts and true-type-fonts
Qt gained some more qpf-fonts and also provides some true-type-fonts. Make sure to install them all inclusive ttf-fonts when freetype-support is enabled. Additionally the empty 'fontdir' file is really not needed. Signed-off-by: Michael Roth <mroth@nessie.de> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/qt/qt.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index a4ca3a9..37849f9 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -455,10 +455,10 @@ $(STAGING_DIR)/usr/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled
qt-gui: $(STAGING_DIR)/usr/lib/libQtCore.la
mkdir -p $(TARGET_DIR)/usr/lib/fonts
- touch $(TARGET_DIR)/usr/lib/fonts/fontdir
- cp -dpf $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
- cp -dpf $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
- cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
+ cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.qpf $(TARGET_DIR)/usr/lib/fonts
+ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)
+ cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
+endif
# Install image plugins if they are built
$(call QT_INSTALL_PLUGINS,imageformats)
ifeq ($(BR2_PACKAGE_QT_SHARED),y)