diff options
author | axis <qt-info@nokia.com> | 2010-01-05 15:07:30 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-01-05 15:07:30 (GMT) |
commit | 0d92fc13baac9d354a7d3a2665ca3bb4127bd606 (patch) | |
tree | 04308596166ab753de6de705fcd80b091e4562ad /mkspecs/features/symbian/application_icon.prf | |
parent | 6abee18b8ab9899b909a15227fba8fbc4506fad8 (diff) | |
parent | 78474a65e4f61e9d1ae8116d5b690cf78729aa71 (diff) | |
download | Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.zip Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.gz Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.bz2 |
Merge branch 'merge-request-1601' into master-s60
Conflicts:
bin/createpackage.pl
mkspecs/features/symbian/application_icon.prf
qmake/generators/symbian/symmake_abld.cpp
src/gui/text/qfontdatabase_s60.cpp
src/s60main/s60main.pro
Diffstat (limited to 'mkspecs/features/symbian/application_icon.prf')
-rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 1edbe14..8849ea0 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -30,7 +30,7 @@ contains( CONFIG, no_icon ) { # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code symbian-abld { #Makefile: requires paths with backslash - ICON = $$replace( ICON, /, \\) + win32:ICON = $$replace(ICON, /, \\) # Extra compiler rules for mifconv mifconv.output = ${ZDIR}$$APP_RESOURCE_DIR/$${baseTarget}.mif @@ -48,4 +48,3 @@ contains( CONFIG, no_icon ) { RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif } } - |