summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-08-05 10:00:36 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-08-06 07:45:57 (GMT)
commit7f59bc3c7f13058e2b8fca076072e99136dd4648 (patch)
tree90966c2e1a4a6e8bd4b1d2bc016a3d8c5b2b0501 /mkspecs/features
parenta8ff8e81f7b120e1ecdd434093be075cdd92fb24 (diff)
downloadQt-7f59bc3c7f13058e2b8fca076072e99136dd4648.zip
Qt-7f59bc3c7f13058e2b8fca076072e99136dd4648.tar.gz
Qt-7f59bc3c7f13058e2b8fca076072e99136dd4648.tar.bz2
Fix run and runonphone targets for projects that have TARGET with path
Sis files are always generated in the pro file directory even if TARGET indicates another target directory. Reviewed-by: axis
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/symbian/run_on_phone.prf8
1 files changed, 5 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf
index 818151a..f77369c 100644
--- a/mkspecs/features/symbian/run_on_phone.prf
+++ b/mkspecs/features/symbian/run_on_phone.prf
@@ -13,23 +13,25 @@ else:!equals(DEPLOYMENT, default_deployment) {
equals(GENERATE_RUN_TARGETS, true) {
symbian-abld|symbian-sbsv2 {
sis_destdir =
+ sis_file = $$basename(TARGET).sis
} else {
sis_destdir = $$DESTDIR
+ sis_file = $${TARGET}.sis
!isEmpty(sis_destdir):!contains(sis_destdir, "[/\\\\]$"):sis_destdir = $${sis_destdir}/
contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\")
}
contains(SYMBIAN_PLATFORMS, "WINSCW"):contains(TEMPLATE, "app") {
run_target.target = run
- run_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${TARGET}.exe" $(QT_RUN_OPTIONS)
+ run_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$$basename(TARGET).exe" $(QT_RUN_OPTIONS)
QMAKE_EXTRA_TARGETS += run_target
}
runonphone_target.target = runonphone
runonphone_target.depends = sis
- runonphone_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${TARGET}.sis"
- contains(TEMPLATE, "app"):runonphone_target.commands += "$${TARGET}.exe" $(QT_RUN_OPTIONS)
+ runonphone_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${sis_file}"
+ contains(TEMPLATE, "app"):runonphone_target.commands += "$$basename(TARGET).exe" $(QT_RUN_OPTIONS)
QMAKE_EXTRA_TARGETS += runonphone_target
}