diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-11-19 12:25:59 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-11-19 12:35:52 (GMT) |
| commit | 745db3d1b9a149910dcaa3c65aabab020eefa027 (patch) | |
| tree | bec9ff9feb8d2ef6b3eecf4d2885515867ba578c /mkspecs | |
| parent | 6c6661041fa3dfe7a8915ee1d27443b2ced179de (diff) | |
| download | Qt-745db3d1b9a149910dcaa3c65aabab020eefa027.zip Qt-745db3d1b9a149910dcaa3c65aabab020eefa027.tar.gz Qt-745db3d1b9a149910dcaa3c65aabab020eefa027.tar.bz2 | |
Use relative paths when invoking mifconv.
Some S60 SDK has a bug which make mifconv to crash with absolute paths.
Switched to use QMAKE_FILE_IN variable in mifconv.commands instead of
using join of ICON keywords. Joining is not needed anymore since ICON
keyword supports only one filename. Using input variable
(QMAKE_FILE_IN) also esnures that absolute path is converted to
relative before invoking mifconv.
Task-number: QTBUG-4745
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 4685c08..1edbe14 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -36,7 +36,7 @@ contains( CONFIG, no_icon ) { mifconv.output = ${ZDIR}$$APP_RESOURCE_DIR/$${baseTarget}.mif # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library # svg-t icons should always use /c32 depth - mifconv.commands = mifconv ${QMAKE_FILE_OUT} $$join(ICON, " /c32 ", "/c32 ",) + mifconv.commands = mifconv ${QMAKE_FILE_OUT} /c32 ${QMAKE_FILE_IN} mifconv.input = ICON mifconv.CONFIG = no_link combine # target_predeps together with combine seems not to work correctly, lets define it by ourselves |