From 379042b84c74988ef5cadfe592aa202a2ebf9c61 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Fri, 25 Apr 2014 08:26:12 +0200 Subject: winphone: Fixed font deployment for Visual Studio projects Instead of collecting all files from the "fonts" directory to deploy them to the phone, we only collect files which are mentioned in the FONTS variable. Otherwise fonts that were copied to the fonts directory earlier (due to FONTS being unset (default fonts) or set to another set of fonts) will also be deployed as part of the project. Change-Id: I24c77e154a9f2ec75e88d487c056b0be46e17e87 Reviewed-by: Andrew Knight Reviewed-by: Oswald Buddenhagen --- mkspecs/features/winrt/font_deployment.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/winrt/font_deployment.prf b/mkspecs/features/winrt/font_deployment.prf index 8fe4ea4c15..c767d5bc1a 100644 --- a/mkspecs/features/winrt/font_deployment.prf +++ b/mkspecs/features/winrt/font_deployment.prf @@ -54,7 +54,9 @@ if(!build_pass:equals(TEMPLATE, "vcapp")) { } !isEmpty(FONTS):winphone:equals(TEMPLATE, "vcapp"):build_pass { - fonts.files = $$OUT_PWD/fonts/* + for (FONT, FONTS) { + fonts.files += $$OUT_PWD/fonts/$$basename(FONT) + } fonts.path = fonts DEPLOYMENT += fonts } -- cgit v1.2.3