diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-04-30 10:12:03 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-04-30 10:17:56 (GMT) |
| commit | 0bebd8e4f3373e61e7fd906c60509cb5a3fa8d80 (patch) | |
| tree | 620d46a89e1c6b65227ff09f99a1a6fe581dd3d0 | |
| parent | 160b51018e1e365130173838f9c91a9cb4061ad7 (diff) | |
| download | Qt-0bebd8e4f3373e61e7fd906c60509cb5a3fa8d80.zip Qt-0bebd8e4f3373e61e7fd906c60509cb5a3fa8d80.tar.gz Qt-0bebd8e4f3373e61e7fd906c60509cb5a3fa8d80.tar.bz2 | |
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
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 6 |
1 files changed, 5 insertions, 1 deletions
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 |