diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-04-12 12:23:33 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-04-12 12:39:25 (GMT) |
| commit | 930db5826ff2c02d54f2851494000c5fab97da54 (patch) | |
| tree | 679b121e4e8fbd4d3a5dee19a142be46ba953152 /mkspecs | |
| parent | 0b623dd9c29de0958b7739215a621e134503cbb2 (diff) | |
| download | Qt-930db5826ff2c02d54f2851494000c5fab97da54.zip Qt-930db5826ff2c02d54f2851494000c5fab97da54.tar.gz Qt-930db5826ff2c02d54f2851494000c5fab97da54.tar.bz2 | |
Fix "make sis" for projects that have empty OBJECTS_DIR
Temp directory for packagaging got created to system root if
OBJECTS_DIR was empty. Fixed it to use '.' instead in those cases.
Reviewed-by: Janne Koskinen
Diffstat (limited to 'mkspecs')
| -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 { |