diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 00:16:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 00:16:28 (GMT) |
| commit | 5fa83d8e2ad78272a1013c45387adffb5e551357 (patch) | |
| tree | 49f0362e1bbf03f668077dfc18a66342bb03ac39 /mkspecs | |
| parent | 7274f7f9cc21beeddb01adadc7eb79ed61459802 (diff) | |
| parent | 5a024622db5dd7d9fb23202500da13813c28224b (diff) | |
| download | Qt-5fa83d8e2ad78272a1013c45387adffb5e551357.zip Qt-5fa83d8e2ad78272a1013c45387adffb5e551357.tar.gz Qt-5fa83d8e2ad78272a1013c45387adffb5e551357.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:
Fix desktopservices demo missing icon in Symbian
Fix path removal from target in Symbian builds
Fix compilation errors in tst_qfileinfo
Symbian (installation) docs.
Make 'make sis' recursive again.
Fix libinfix usage
Make symbian-resource files aware of libInfix configure feature
Update symbian def files for 4.7
Correction to EGL stub implementation
Fix 'make sis' when media services is disabled and multimedia is not
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/sis_targets.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 6 | ||||
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index 66a7a9d..7d70fc6 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -1,5 +1,5 @@ # Sis file creation -contains(TEMPLATE, app)|!isEmpty(DEPLOYMENT) { +contains(TEMPLATE, app)|!count(DEPLOYMENT, 1) { symbian-abld|symbian-sbsv2 { sis_destdir = make_cache_name = .make.cache diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 9979f40..76f9ba1 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -31,7 +31,11 @@ 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 + # Absolute path required for shadow builds. + # However, in older Symbian environments abld toolchain can't handle even moderately long + # paths, so don't force absolute there. + !symbian-abld:!contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON + #Makefile: requires paths with backslash ICON_backslashed = $$ICON diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index a097771..c21b4c9 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -208,7 +208,7 @@ for(symbian_resource, SYMBIAN_RESOURCES) { } symbianresources.input = SYMBIAN_RESOURCES -symbianresources.output = $$symbian_resources_RCC_DIR/${QMAKE_FILE_BASE}.rsg +symbianresources.output = $$symbian_resources_RCC_DIR/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsg symbianresources.commands = cpp -nostdinc -undef \ $$symbian_resources_INCLUDES \ $$symbian_resources_DEFINES \ @@ -216,8 +216,8 @@ symbianresources.commands = cpp -nostdinc -undef \ -o $${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rpp \ && rcomp -u -m045,046,047 \ -s$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rpp \ - -o$${symbianDestdir}/${QMAKE_FILE_BASE}.rsc \ - -h$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rsg \ + -o$${symbianDestdir}/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsc \ + -h$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsg \ -i${QMAKE_FILE_NAME} symbianresources.dependency_type = TYPE_C symbianresources.CONFIG = no_link target_predeps |