diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-23 04:20:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-23 04:20:51 (GMT) |
| commit | 54f2244555793ca5a20c1a54aacd38bd0fc98a83 (patch) | |
| tree | bb3e9da44a234d9b291e32398d2d08cbb16ff1f1 /mkspecs | |
| parent | 3b8c2ac3de34dc43758dd36c0e57a83efda297a9 (diff) | |
| parent | 540d423311a6d1bbd3d8046f37967179b303a231 (diff) | |
| download | Qt-54f2244555793ca5a20c1a54aacd38bd0fc98a83.zip Qt-54f2244555793ca5a20c1a54aacd38bd0fc98a83.tar.gz Qt-54f2244555793ca5a20c1a54aacd38bd0fc98a83.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c
Enable installation of a sis file without running any application
Replace download % display with a progress bar
This file does not exist
Fix configure false positives when checking for symbian
Fix compile on symbian better.
Make ICON generation (to symbian mif) work for relative paths/shadow builds
Diffstat (limited to 'mkspecs')
| -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 |