diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-05 16:30:28 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-05 16:30:28 (GMT) |
| commit | 9e95890804d8b5114f8090496b82327178055348 (patch) | |
| tree | dbc17e0bceadcbd771e45a29cb1addcdd7fa18c2 /mkspecs/features/symbian | |
| parent | 671fff6071d1064094bf41364b11df3b55e7a65c (diff) | |
| parent | d1ac6af4f30e822e161fd8772104aa2e30e55a2f (diff) | |
| download | Qt-9e95890804d8b5114f8090496b82327178055348.zip Qt-9e95890804d8b5114f8090496b82327178055348.tar.gz Qt-9e95890804d8b5114f8090496b82327178055348.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'mkspecs/features/symbian')
| -rw-r--r-- | mkspecs/features/symbian/sis_targets.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf index d0fe881..f3452b7 100644 --- a/mkspecs/features/symbian/sis_targets.prf +++ b/mkspecs/features/symbian/sis_targets.prf @@ -26,7 +26,11 @@ equals(GENERATE_SIS_TARGETS, true) { qtPrepareTool(QMAKE_CREATEPACKAGE, createpackage) - CREATEPACKAGE_DIR = $$OBJECTS_DIR/createpackage_tmp + sis_objects_dir = $$OBJECTS_DIR + isEmpty(sis_objects_dir):sis_objects_dir = . + + CREATEPACKAGE_DIR = $$sis_objects_dir/createpackage_tmp + QMAKE_CLEAN += $$CREATEPACKAGE_DIR/* symbian-abld|symbian-sbsv2 { |