diff options
| author | axis <qt-info@nokia.com> | 2010-02-26 12:07:02 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-26 12:32:59 (GMT) |
| commit | 721d7a47ba22fd791f2569427dd6285ac3384ff5 (patch) | |
| tree | 9b697c8aeed64431d2d3968041e4a5740304e2f2 /mkspecs | |
| parent | 1edd1229b5a2381da2a85ebbfb4539d83a13ef3f (diff) | |
| download | Qt-721d7a47ba22fd791f2569427dd6285ac3384ff5.zip Qt-721d7a47ba22fd791f2569427dd6285ac3384ff5.tar.gz Qt-721d7a47ba22fd791f2569427dd6285ac3384ff5.tar.bz2 | |
Removed restrictions on file names from the Symbian makefile system.
Spaces in filenames still won't work, but that is very tricky to fix
because you cannot escape filenames inside the QMAKE_EXTRA_COMPILERS
section.
Task: QTBUG-8555
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 8 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-armcc/features/symbian_building.prf | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 41f1718..527c33d 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -22,10 +22,12 @@ contains( CONFIG, no_icon ) { baseTarget = $$basename(TARGET) baseTarget = $$replace(baseTarget, /,_) baseTarget = $$replace(baseTarget, \\,_) - baseTarget = $$replace(baseTarget, -,_) - baseTarget = $$replace(baseTarget, :,_) - baseTarget = $$replace(baseTarget, \.,_) baseTarget = $$replace(baseTarget, " ",_) + symbian-abld|symbian-sbsv2 { + baseTarget = $$replace(baseTarget, -,_) + baseTarget = $$replace(baseTarget, \.,_) + baseTarget = $$replace(baseTarget, :,_) + } # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code !symbian-sbsv2 { diff --git a/mkspecs/symbian/linux-armcc/features/symbian_building.prf b/mkspecs/symbian/linux-armcc/features/symbian_building.prf index b0185d0..67b3075 100644 --- a/mkspecs/symbian/linux-armcc/features/symbian_building.prf +++ b/mkspecs/symbian/linux-armcc/features/symbian_building.prf @@ -150,9 +150,7 @@ QMAKE_EXTRA_COMPILERS += symbianresources contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") { baseTarget = $$basename(TARGET) - baseTarget = $$replace(baseTarget, -,_) - baseTarget = $$replace(baseTarget, :,_) - baseTarget = $$replace(baseTarget, \.,_) + # If you change this, also see application_icon.prf baseTarget = $$replace(baseTarget, " ",_) # Make our own extra compiler target in order to get dependencies for generated |