Fix recursive 'make sis' for symbian builds

It makes no sense for 'sis' to depend on 'first' or really any target
in symbian-abld and symbian-sbsv2 builds, as all builds are recursive
anyway.

Also do not generate real sis targets for projects that do not
actually deploy anything, making the check equivalent to one
in qmake for generating pkg files.

Task-number: QTBUG-5312
Reviewed-by: Janne Koskinen

1 files changed, 13 insertions, 2 deletions

diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf
index 0023b54..b149a22 100644
--- a/mkspecs/features/sis_targets.prf
+++ b/mkspecs/features/sis_targets.prf
@@ -1,5 +1,15 @@
 # Sis file creation
-contains(TEMPLATE, app)|!equals(DEPLOYMENT, default_deployment) {
+GENERATE_SIS_TARGETS = false
+
+contains(TEMPLATE, app): GENERATE_SIS_TARGETS = true
+else:!equals(DEPLOYMENT, default_deployment) {
+    for(dep_item, $$list($$DEPLOYMENT)) {
+        dep_item_sources = $$eval($${dep_item}.sources)
+        !isEmpty(dep_item_sources): GENERATE_SIS_TARGETS = true
+    }
+}
+
+equals(GENERATE_SIS_TARGETS, true) {
     symbian-abld|symbian-sbsv2 {
         sis_destdir =
         make_cache_name = .make.cache
@@ -129,7 +139,8 @@ contains(TEMPLATE, app)|!equals(DEPLOYMENT, default_deployment) {
     } else {
         # Make sure we build everything, since other sis targets in a recursive invocation
         # may depend on them, even if this one is empty.
-        sis_target.depends = first
+        # In abld/sbsv2, we assume that subdir has been built already, as all builds are recursive.
+        !symbian-abld:!symbian-sbsv2: sis_target.depends = first
     }
     sis_target.commands =
     sis_target.target = sis