Commit 4e272254 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

package/qt: add font selection 



Commit f9854762 (make sure to install all Qt-fonts and true-type-fonts)
changed Qt to install all .qpf fonts to the target instead of only a
hardcoded subset. Some of those fonts are unfortunately quite big (1-2MB)
and are not always needed (japanese, unicode).

Instead add a font selection in Kconfig similar to how it is done for
pixel depths, and default to the subset we were previously using.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 518804f3

package/qt/Config.in

+46 −26
Original line number Diff line number Diff line
@@ -101,6 +101,52 @@ config BR2_PACKAGE_QT_PIXEL_DEPTH_32 


endmenu



menu "Fonts"



config BR2_PACKAGE_QT_FONT_MICRO

	bool "micro"

	default y



config BR2_PACKAGE_QT_FONT_FIXED

	bool "fixed"

	default y



config BR2_PACKAGE_QT_FONT_HELVETICA

	bool "helvetica"

	default y



config BR2_PACKAGE_QT_FONT_JAPANESE

	bool "japanese"



config BR2_PACKAGE_QT_FONT_UNIFONT

	bool "unicode"



endmenu



choice

	prompt "freetype2 support"

	default BR2_PACKAGE_QT_NOFREETYPE

	help

	  Select freetype2 support.



config BR2_PACKAGE_QT_NOFREETYPE

	bool "no freetype2 support"

	help

	  Do not compile in Freetype2 support.



config BR2_PACKAGE_QT_QTFREETYPE

	bool "Qt freetype2"

	help

	  Use the libfreetype bundled with Qt.



config BR2_PACKAGE_QT_SYSTEMFREETYPE

	bool "System freetype2"

	select BR2_PACKAGE_FREETYPE

	help

	  Use shared libfreetype from the target system.

	  See http://www.freetype.org/

endchoice



config BR2_PACKAGE_QT_GIF

	bool "Enable GIF support"

	help
@@ -188,32 +234,6 @@ config BR2_PACKAGE_QT_SYSTEMZLIB 
	  Use the shared zlib from the system.

endchoice



choice

	prompt "freetype2 support"

	depends on BR2_PACKAGE_QT_GUI_MODULE

	default BR2_PACKAGE_QT_NOFREETYPE

	help

	  Select freetype2 support.



config BR2_PACKAGE_QT_NOFREETYPE

	bool "no freetype2 support"

	help

	  Do not compile in Freetype2 support.





config BR2_PACKAGE_QT_QTFREETYPE

	bool "Qt freetype2"

	help

	  Use the libfreetype bundled with Qt.



config BR2_PACKAGE_QT_SYSTEMFREETYPE

	bool "System freetype2"

	select BR2_PACKAGE_FREETYPE

	help

	  Use shared libfreetype from the target system.

	  See http://www.freetype.org/

endchoice



config BR2_PACKAGE_QT_EMB_PLATFORM

	string "The embedded platform we are making Qt for"

	default "arm"	if BR2_arm

package/qt/qt.mk

+11 −1
Original line number Diff line number Diff line
@@ -220,6 +220,14 @@ endif 
endif





QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \

	   $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \

	   $(if $(BR2_PACKAGE_QT_FONT_FIXED),fixed) \

	   $(if $(BR2_PACKAGE_QT_FONT_HELVETICA),helvetica) \

	   $(if $(BR2_PACKAGE_QT_FONT_JAPANESE),japanese) \

	   $(if $(BR2_PACKAGE_QT_FONT_UNIFONT),unifont)))





ifeq ($(BR2_PACKAGE_QT_QTFREETYPE),y)

QT_CONFIGURE+= -qt-freetype

else
@@ -445,7 +453,9 @@ $(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

	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.qpf $(TARGET_DIR)/usr/lib/fonts

ifneq ($(QT_FONTS),)

	cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts

endif

ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)

	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts

endif