diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-08-24 12:56:02 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-08-24 13:09:05 (GMT) |
| commit | a9822d39136a3f7912cc68320cfe030d95b4cb4f (patch) | |
| tree | 41ca2605cd6c6b1c6990a27cebaa4e9cf3cb2105 /mkspecs | |
| parent | 8cd5df01478f59fd62786fce032ab7ce04656ca4 (diff) | |
| download | Qt-a9822d39136a3f7912cc68320cfe030d95b4cb4f.zip Qt-a9822d39136a3f7912cc68320cfe030d95b4cb4f.tar.gz Qt-a9822d39136a3f7912cc68320cfe030d95b4cb4f.tar.bz2 | |
Improved support for shadow builds in Symbian.
It is now possible to make shadow builds in Symbian.
Note that any relative host side paths specified via BLD_INF_RULES,
MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted
to point to build directory.
Task-number: QTBUG-10432
Rubber-stamped-by: ossi
Reviewed-by: TrustMe
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index f058399..dc23428 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -45,9 +45,7 @@ contains(CONFIG, no_icon) { # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code !symbian-sbsv2 { # 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 + !contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON #Makefile: requires paths with backslash ICON_backslashed = $$ICON |