diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-11-19 12:09:50 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-11-19 12:35:51 (GMT) |
| commit | 6c6661041fa3dfe7a8915ee1d27443b2ced179de (patch) | |
| tree | f22fb21e7b6d29414e0e057b4fbb130bdd5345ae | |
| parent | ea3ba57cf80954ca11e1c446181f6cee3656ce3e (diff) | |
| download | Qt-6c6661041fa3dfe7a8915ee1d27443b2ced179de.zip Qt-6c6661041fa3dfe7a8915ee1d27443b2ced179de.tar.gz Qt-6c6661041fa3dfe7a8915ee1d27443b2ced179de.tar.bz2 | |
Unified ICON keyword handling for ABLD and SBSv2 toolchains.
With SBSv2 toolchain only first file from ICON keyword is used and
it is actually the right behaviour. Originally support for multiple
files in ICON keyword was introduced to support localized application
icons. However, in that case the different localized icons should not
go to same MIF file since it is not possible to define in .rss file
which icon number should be used for which language.
To support a localized application icons separate MIF for each locale
should be created and installation of ICON should depend on selected
language. Implementing proper support for localized icons is left
for another task.
Task-number: QTBUG-4745
Reviewed-by: Miikka Heikkinen
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 62fd018..4685c08 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -9,8 +9,9 @@ contains( CONFIG, no_icon ) { # There is no point in compiling the MIF icon if no_icon CONFIGS is set !isEmpty(ICON) { - !count(ICON, $$size(TRANSLATIONS)):!count(ICON, 1) { - message("ICON keyword must have one or the same amout of items as in TRANSLATIONS keyword") + !count(ICON, 1) { + ICON = $$first(ICON) + warning("Only first icon specified in ICON variable is used: $$ICON") } # Try to produce indentical string to fixedTarget in SymbianMakefileGenerator, replaced chars taken |