Moved runonphone target to prf files for all build systems.

This reduces code duplication.

RevBy:    Miikka Heikkinen

1 files changed, 23 insertions, 6 deletions

diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf
index d3d2cfb..6948a48 100644
--- a/mkspecs/features/symbian/run_on_phone.prf
+++ b/mkspecs/features/symbian/run_on_phone.prf
@@ -1,14 +1,31 @@
 # make sure we have a sis file and then call 'runonphone' to execute it on the phone
 
-contains(TEMPLATE, app)|!equals(DEPLOYMENT, default_deployment) {
+GENERATE_RUN_TARGETS = false
+
+contains(TEMPLATE, app): GENERATE_RUN_TARGETS = true
+else:!equals(DEPLOYMENT, default_deployment) {
+    for(dep_item, $$list($$DEPLOYMENT)) {
+        dep_item_sources = $$eval($${dep_item}.sources)
+        !isEmpty(dep_item_sources): GENERATE_RUN_TARGETS = true
+    }
+}
+
+equals(GENERATE_RUN_TARGETS, true) {
     sis_destdir = $$DESTDIR
     !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\\\]$"):sis_destdir = $${sis_destdir}/
     contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\")
 
-    run_target.target = runonphone
-    run_target.depends = sis
-    run_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${TARGET}.sis"
-    contains(TEMPLATE, "app"):run_target.commands += "$${TARGET}.exe" $(QT_RUN_OPTIONS)
+    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)
+
+        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)
 
-    QMAKE_EXTRA_TARGETS += run_target
+    QMAKE_EXTRA_TARGETS += runonphone_target
 }