From 66cf8c714a6194036d9735a7d6c52d4394193a21 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 19 Feb 2010 15:06:59 +0100 Subject: Added exception to destdir location for abld and sbsv2. It was supposed to be in my last commit, but I forgot it. --- mkspecs/features/symbian/qt.prf | 10 +++++++--- 1 file 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), \ -- cgit v0.12