diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-02-04 17:02:07 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-21 21:53:05 +0200 |
| commit | 39213b999d4f67096386a5edfbc406c577266c69 (patch) | |
| tree | eda5b4cd5f79cefe8d3e7695d07d26117325d435 | |
| parent | 6cb13bafa083432b5eb8f164f3d420e6a6ef9e90 (diff) | |
| download | ptxdist-39213b999d4f67096386a5edfbc406c577266c69.tar.gz ptxdist-39213b999d4f67096386a5edfbc406c577266c69.tar.xz | |
[xorg-fonts] add option to create links in Qt4 fontdir
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/graphics_and_multimedia.in | 9 | ||||
| -rw-r--r-- | rules/xorg-fonts.make | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in index 38c32825f..d41c8a87e 100644 --- a/rules/graphics_and_multimedia.in +++ b/rules/graphics_and_multimedia.in @@ -25,6 +25,15 @@ config XORG_FONTS select HOST_XORG_APP_BDFTOPCF select HOST_XORG_FONT_UTIL +config XORG_FONTS_QT4_LINKS + depends on QT4_PLATFORM_EMBEDDED + bool + prompt "Make fonts accessable for QtEmbedded" + help + QtEmbedded only looks in one directory for fonts. This will create + links to all fonts int the Qt Font directory to allow QtEmbedded + applications to use these fonts. + source "generated/multimedia_xorg_font.in" endif diff --git a/rules/xorg-fonts.make b/rules/xorg-fonts.make index 84aec82e7..403ca21aa 100644 --- a/rules/xorg-fonts.make +++ b/rules/xorg-fonts.make @@ -111,6 +111,15 @@ $(STATEDIR)/xorg-fonts.targetinstall.post: $(XORG_FONTS_DIR_INSTALL)/$$file, \ $(XORG_FONTDIR)/$$file, n); \ done +ifdef PTXCONF_XORG_FONTS_QT4_LINKS + @cd $(XORG_FONTS_DIR_INSTALL); \ + find . -type f | while read file; do \ + name=`basename $$file`; \ + $(call install_link, xorg-fonts, \ + ../../..$(XORG_FONTDIR)/$$file, \ + /usr/lib/fonts/$$name); \ + done +endif @$(call install_finish, xorg-fonts) |