diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-03-22 13:09:34 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-03-22 14:52:04 (GMT) |
| commit | 24020b3997ad263e457426e831a7ef50b4bf730c (patch) | |
| tree | 7190f0c7936efc5dd8c5fe846cfdebbca57ac965 | |
| parent | da7c6cc8995f063435b25938ac10739a6e7f0067 (diff) | |
| download | Qt-24020b3997ad263e457426e831a7ef50b4bf730c.zip Qt-24020b3997ad263e457426e831a7ef50b4bf730c.tar.gz Qt-24020b3997ad263e457426e831a7ef50b4bf730c.tar.bz2 | |
Make ICON generation (to symbian mif) work for relative paths/shadow builds
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 1109060..ecf987d 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -31,6 +31,7 @@ contains( CONFIG, no_icon ) { # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code !symbian-sbsv2 { + !contains(ICON, "^(/|\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON #absolute path #Makefile: requires paths with backslash ICON_backslashed = $$ICON contains(QMAKE_HOST.os, "Windows"):ICON_backslashed = $$replace( ICON_backslashed, /, \\) @@ -50,6 +51,7 @@ contains( CONFIG, no_icon ) { # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library # svg-t icons should always use /c32 depth mifconv.commands = mifconv $$mifconv.target /c32 $$ICON_backslashed + mifconv.depends = $$ICON PRE_TARGETDEPS += $$mifconv.target QMAKE_EXTRA_TARGETS += mifconv |