Prevent empty arrays from ending up in the JS artifacts map

We want to guarantee that p.artifacts["xyz"] is undefined if product or
module "p" does not have an artifact tagged "xyz". Otherwise, the code
on the JS side becomes needlessly complicated.

Change-Id: I6bffa2289ce8a021eb856697545a8149f88e616d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

3 files changed, 13 insertions, 0 deletions

diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp
index f36426075..a0dd7e8d4 100644
--- a/src/lib/corelib/buildgraph/buildgraph.cpp
+++ b/src/lib/corelib/buildgraph/buildgraph.cpp
@@ -146,6 +146,11 @@ template<class ProductOrModule> static QScriptValue js_artifacts(
     ctx->callee().setProperty(CachedValueKey, artifactsObj);
     const auto &map = artifactsMap(productOrModule);
     for (auto it = map.cbegin(); it != map.cend(); ++it) {
+        const auto filter = [productOrModule](const Artifact *a) {
+            return isRelevantArtifact(productOrModule, a);
+        };
+        if (std::none_of(it.value().cbegin(), it.value().cend(), filter))
+            continue;
         QScriptValue fileTagFunc = engine->newFunction(&js_artifactsForFileTag<ProductOrModule>,
                                                        productOrModule);
         const QString fileTag = it.key().toString();
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/lib5.cpp b/tests/auto/blackbox/testdata/dynamic-library-in-module/lib5.cpp
new file mode 100644
index 000000000..49887a957
--- /dev/null
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/lib5.cpp
@@ -0,0 +1 @@
+void staticLibFunc() { }
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
index cfad43973..6bd0de9ab 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
@@ -7,6 +7,7 @@ Project {
         Depends { name: "theotherlib" }
         Depends { name: "thethirdlib" }
         Depends { name: "thefourthlib" }
+        Depends { name: "staticlib" }
         files: "main.cpp"
         Group {
             fileTagsFilter: "dynamiclibrary"
@@ -23,4 +24,10 @@ Project {
             cpp.rpaths: [qbs.installRoot]
         }
     }
+    StaticLibrary {
+        name: "staticlib"
+        Depends { name: "cpp" }
+        Depends { name: "theotherlib" }
+        files: "lib5.cpp"
+    }
 }