Quellcode durchsuchen

qt: add enable for truetype font installation

Currently, qt.mk installs DejaVu/Vera TrueType fonts when Qt is configured for
freetype support. However, some users may prefer to limit the installed fonts
to only Qt's prerendered fonts (micro, fixed, helvetica, etc.). Or, there may
be a preference to use seperately installed TrueType fonts. This commit adds
a switch to explicitly control the installation of the TrueType fonts, similar
to the existing prerendered font enables.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Danomi Manchego vor 8 Jahren
Ursprung
Commit
f48f1a89a0
2 geänderte Dateien mit 9 neuen und 1 gelöschten Zeilen
  1. 8 0
      package/qt/Config.in
  2. 1 1
      package/qt/qt.mk

+ 8 - 0
package/qt/Config.in

@@ -185,6 +185,14 @@ endmenu
 
 menu "Fonts"
 
+config BR2_PACKAGE_QT_FONT_TRUETYPE
+	bool "dejavu/vera"
+	depends on BR2_PACKAGE_QT_QTFREETYPE || BR2_PACKAGE_QT_SYSTEMFREETYPE
+	default y
+
+comment "dejavu/vera fonts need freetype support"
+	depends on !BR2_PACKAGE_QT_QTFREETYPE && !BR2_PACKAGE_QT_SYSTEMFREETYPE
+
 config BR2_PACKAGE_QT_FONT_MICRO
 	bool "micro"
 	default y

+ 1 - 1
package/qt/qt.mk

@@ -689,7 +689,7 @@ QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont
 endif
 endif # QT_FONTS
 
-ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
+ifeq ($(BR2_PACKAGE_QT_FONT_TRUETYPE),y)
 define QT_INSTALL_TARGET_FONTS_TTF
 	mkdir -p $(TARGET_DIR)/usr/lib/fonts
 	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts