summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-03-23 10:02:34 (GMT)
committeraxis <qt-info@nokia.com>2010-03-23 10:06:51 (GMT)
commit8f65acdd3b74788b949d84e59acc881b767e9f15 (patch)
tree3e8fb0b1ea91fbfb6b0125dba4b9df21a43016d5 /mkspecs
parent21ca1f5e48a978c76ef7d39628226b5afba2d1a8 (diff)
downloadQt-8f65acdd3b74788b949d84e59acc881b767e9f15.zip
Qt-8f65acdd3b74788b949d84e59acc881b767e9f15.tar.gz
Qt-8f65acdd3b74788b949d84e59acc881b767e9f15.tar.bz2
Fixed mif generation on symbian-abld.
We have to do backslash fixing because we are using QMAKE_EXTRA_TARGETS instead of QMAKE_EXTRA_COMPILERS, which in turn is needed to get clean targets correct on the symbian/* mkspecs.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/symbian/application_icon.prf5
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index b583313..9979f40 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -34,7 +34,6 @@ contains( CONFIG, no_icon ) {
!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, /, \\)
symbian-abld {
mifIconZDir = ${ZDIR}$$APP_RESOURCE_DIR
@@ -48,6 +47,10 @@ contains( CONFIG, no_icon ) {
# Extra compiler rules for mifconv
mifconv.target = $$mifIconZDir/$${baseTarget}.mif
+ contains(QMAKE_HOST.os, "Windows") {
+ ICON_backslashed = $$replace(ICON_backslashed, /, \\)
+ mifconv.target = $$replace(mifconv.target, /, \\)
+ }
# 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