diff options
| author | axis <qt-info@nokia.com> | 2010-02-19 14:06:59 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-19 14:06:59 (GMT) |
| commit | 66cf8c714a6194036d9735a7d6c52d4394193a21 (patch) | |
| tree | 2cdeb63742eae6440705fd6b2dcde657dc422555 | |
| parent | ade4d096fc2ea145a3d9586e3ab2a9af9c5a9a72 (diff) | |
| download | Qt-66cf8c714a6194036d9735a7d6c52d4394193a21.zip Qt-66cf8c714a6194036d9735a7d6c52d4394193a21.tar.gz Qt-66cf8c714a6194036d9735a7d6c52d4394193a21.tar.bz2 | |
Added exception to destdir location for abld and sbsv2.
It was supposed to be in my last commit, but I forgot it.
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index a20aa1d..02b3003 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -42,9 +42,13 @@ isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000 # Sis file creation make_cache_name = .make.cache -fixedDestdir = $$DESTDIR -!isEmpty(fixedDestdir):!contains(fixedDestdir, "[/\\]$"):fixedDestdir = $${fixedDestdir}/ -contains(QMAKE_HOST.os, "Windows"):fixedDestdir = $$replace(fixedDestdir, "/", "\\") +!symbian-abld:!symbian-sbsv2 { + fixedDestdir = $$DESTDIR + !isEmpty(fixedDestdir):!contains(fixedDestdir, "[/\\]$"):fixedDestdir = $${fixedDestdir}/ + contains(QMAKE_HOST.os, "Windows"):fixedDestdir = $$replace(fixedDestdir, "/", "\\") +} else { + fixedDestdir = +} sis_target.target = sis sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \ |