Act on some version-related TODO items

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

1 files changed, 2 insertions, 38 deletions

diff --git a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs
index ff40604b4..2ea2e988d 100644
--- a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs
+++ b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs
@@ -18,47 +18,11 @@ Project {
         bundle.isBundle: false
         files: ["lib2.cpp"]
     }
-    // TODO: Remove once we have parameterized dependencies
-    Product {
-        name: "barrier"
-        type: ["blubb"]
-        Depends { name: "lib1" }
-        Depends { name: "lib2" }
-        Rule {
-            multiplex: true
-            inputsFromDependencies: ["staticlibrary"]
-            Artifact {
-                filePath: "dummy"
-                fileTags: ["blubb"]
-            }
-            prepare: {
-                var cmd = new JavaScriptCommand();
-                cmd.silent = true;
-                cmd.sourceCode = function() { }
-                return [cmd];
-            }
-        }
-    }
     CppApplication {
-        Depends { name: "barrier" }
+        Depends { name: "lib1"; cpp.link: false }
+        Depends { name: "lib2"; cpp.link: false }
         files: ["main.cpp"]
         cpp.libraryPaths: [project.libDir]
         cpp.staticLibraries: ["lib1", "lib2", "lib1"]
-        Rule {
-            inputsFromDependencies: ["blubb"]
-            Artifact {
-                filePath: "dummy.cpp"
-                fileTags: ["cpp"]
-            }
-            prepare: {
-                var cmd = new JavaScriptCommand();
-                cmd.sourceCode = function() {
-                    var f = new TextFile(output.filePath, TextFile.WriteOnly);
-                    f.writeLine("void dummy() { }");
-                    f.close();
-                };
-                return [cmd];
-            }
-        }
     }
 }