From 0bebd8e4f3373e61e7fd906c60509cb5a3fa8d80 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 30 Apr 2010 13:12:03 +0300 Subject: Fix desktopservices demo missing icon in Symbian Symbian abld toolchain cannot handle very long paths for mifconv source images, so do not absolutize the path. This should not be a problem, as the absolute icon path is only needed for shadow builds, which are not supported in symbian-abld anyway. Task-number: QTBUG-10135 Reviewed-by: Thomas Zander --- mkspecs/features/symbian/application_icon.prf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 9979f40..76f9ba1 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -31,7 +31,11 @@ contains( CONFIG, no_icon ) { # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code !symbian-sbsv2 { - !contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON #absolute path + # Absolute path required for shadow builds. + # However, in older Symbian environments abld toolchain can't handle even moderately long + # paths, so don't force absolute there. + !symbian-abld:!contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON + #Makefile: requires paths with backslash ICON_backslashed = $$ICON -- cgit v0.12