summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/qt/Config.in8
-rw-r--r--package/qt/qt.mk2
2 files changed, 9 insertions, 1 deletions
diff --git a/package/qt/Config.in b/package/qt/Config.in
index fa5235d6f4..a7617592a6 100644
--- a/package/qt/Config.in
+++ b/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
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index e82bdfe801..1faab74dbd 100644
--- a/package/qt/qt.mk
+++ b/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
OpenPOWER on IntegriCloud