diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-31 11:57:08 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-31 12:48:27 (GMT) |
| commit | 0781e6e539b07872f5d2063594a2057f3e31c9ec (patch) | |
| tree | d8fbec55e510146f0749426fe98f714701a18250 /mkspecs/features | |
| parent | cf28f6cacf59d434072656af05466541ba69e8ae (diff) | |
| download | Qt-0781e6e539b07872f5d2063594a2057f3e31c9ec.zip Qt-0781e6e539b07872f5d2063594a2057f3e31c9ec.tar.gz Qt-0781e6e539b07872f5d2063594a2057f3e31c9ec.tar.bz2 | |
Fix gcce building of apps using static libraries in symbian-sbsv2
Removed usage of buggy .release_gcce target from symbian-sbsv2
generated makefiles. Now gcce builds like armv5 as it is supposed to
when using Raptor.
Task-number: QTBUG-13307
Reviewed-by: axis
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/sis_targets.prf | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index abdf2d4..e069ee1 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -11,6 +11,12 @@ else:!equals(DEPLOYMENT, default_deployment) { equals(GENERATE_SIS_TARGETS, true) { symbian-abld|symbian-sbsv2 { + symbian-sbsv2 { + CONVERT_GCCE_PARAM = -g + } else { + CONVERT_GCCE_PARAM = + } + make_cache_name = .make.cache sis_target.target = sis sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \ @@ -28,7 +34,7 @@ equals(GENERATE_SIS_TARGETS, true) { ) ok_sis_target.target = ok_sis - ok_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_template.pkg \ + ok_sis_target.commands = createpackage.bat $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) $$basename(TARGET)_template.pkg \ $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) unsigned_sis_target.target = unsigned_sis @@ -47,7 +53,7 @@ equals(GENERATE_SIS_TARGETS, true) { ) ok_unsigned_sis_target.target = ok_unsigned_sis - ok_unsigned_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) -o $$basename(TARGET)_template.pkg $(QT_SIS_TARGET) + ok_unsigned_sis_target.commands = createpackage.bat $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) -o $$basename(TARGET)_template.pkg $(QT_SIS_TARGET) target_sis_target.target = $$basename(TARGET).sis target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis |