1 files changed, 93 insertions, 85 deletions
diff --git a/tests/auto/api/testdata/multiplexing/multiplexing.qbs b/tests/auto/api/testdata/multiplexing/multiplexing.qbs
index 9027743b4..3d099eb7a 100644
--- a/tests/auto/api/testdata/multiplexing/multiplexing.qbs
+++ b/tests/auto/api/testdata/multiplexing/multiplexing.qbs
@@ -2,93 +2,101 @@ import qbs
 import qbs.TextFile
 
 Project {
-    Product {
-        name: "no-multiplexing"
-        type: ["reversed-text"]
-        files: ["foo.txt"]
-    }
-    Product {
-        name: "multiplex-without-aggregator-2"
-        type: ["reversed-text"]
-        files: ["foo.txt"]
-        multiplexByQbsProperties: ["architectures"]
-        qbs.architectures: ["TRS-80", "C64"]
-    }
-    Product {
-        name: "multiplex-with-export"
-        type: ["reversed-text"]
-        files: ["foo.txt"]
-        multiplexByQbsProperties: ["architectures"]
-        qbs.architectures: ["TRS-80", "C64"]
-        Export { Depends { name: "multiplex-without-aggregator-2" } }
-    }
-    Product {
-        name: "nonmultiplex-with-export"
-        type: ["reversed-text"]
-        files: ["foo.txt"]
-        Export { Depends { name: "multiplex-without-aggregator-2" } }
-    }
-    Product {
-        name: "nonmultiplex-exporting-aggregation"
-        type: ["reversed-text"]
-        files: ["foo.txt"]
-        Export { Depends { name: "multiplex-with-aggregator-2" } }
-    }
-    Product {
-        name: "multiplex-using-export"
-        type: ["reversed-text"]
-        files: ["foo.txt"]
-        multiplexByQbsProperties: ["architectures"]
-        qbs.architectures: ["TRS-80", "C64"]
-        Depends { name: "multiplex-with-export" }
-    }
-    Product {
-        name: "multiplex-without-aggregator-2-depend-on-non-multiplexed"
-        type: ["reversed-text"]
-        files: ["foo.txt"]
-        multiplexByQbsProperties: ["architectures"]
-        qbs.architectures: ["TRS-80", "C64"]
-        Depends { name: "no-multiplexing" }
-    }
-    Product {
-        name: "multiplex-without-aggregator-4"
-        type: ["reversed-text"]
-        files: ["foo.txt"]
-        multiplexByQbsProperties: ["architectures", "buildVariants"]
-        qbs.architectures: ["TRS-80", "C64"]
-        qbs.buildVariants: ["debug", "release"]
-    }
-    Product {
-        name: "multiplex-with-aggregator-2"
-        type: ["reversed-text"]
-        files: ["foo.txt"]
-        aggregate: true
-        multiplexByQbsProperties: ["architectures"]
-        qbs.architectures: ["TRS-80", "C64"]
-        qbs.architecture: "Atari ST"
-    }
-    Product {
-        name: "multiplex-with-aggregator-2-dependent"
-        Depends { name: "multiplex-with-aggregator-2" }
-        type: ["something"]
-        files: ["foo.txt"]
-    }
-    Product {
-        name: "non-multiplexed-with-dependencies-on-multiplexed"
-        Depends { name: "multiplex-without-aggregator-2" }
-    }
-    Product {
-        name: "non-multiplexed-with-dependencies-on-multiplexed-via-export1"
-        Depends { name: "multiplex-with-export" }
-    }
-    Product {
-        name: "non-multiplexed-with-dependencies-on-multiplexed-via-export2"
-        Depends { name: "nonmultiplex-with-export" }
+    Project {
+        name: "subproject 1"
+        Product {
+            name: "multiplex-using-export"
+            type: ["reversed-text"]
+            files: ["foo.txt"]
+            multiplexByQbsProperties: ["architectures"]
+            qbs.architectures: ["TRS-80", "C64"]
+            Depends { name: "multiplex-with-export" }
+        }
+        Product {
+            name: "multiplex-without-aggregator-2-depend-on-non-multiplexed"
+            type: ["reversed-text"]
+            files: ["foo.txt"]
+            multiplexByQbsProperties: ["architectures"]
+            qbs.architectures: ["TRS-80", "C64"]
+            Depends { name: "no-multiplexing" }
+        }
+        Product {
+            name: "multiplex-with-aggregator-2"
+            type: ["reversed-text"]
+            files: ["foo.txt"]
+            aggregate: true
+            multiplexByQbsProperties: ["architectures"]
+            qbs.architectures: ["TRS-80", "C64"]
+            qbs.architecture: "Atari ST"
+        }
+        Product {
+            name: "multiplex-with-aggregator-2-dependent"
+            Depends { name: "multiplex-with-aggregator-2" }
+            type: ["something"]
+            files: ["foo.txt"]
+        }
+        Product {
+            name: "non-multiplexed-with-dependencies-on-multiplexed"
+            Depends { name: "multiplex-without-aggregator-2" }
+        }
+        Product {
+            name: "non-multiplexed-with-dependencies-on-multiplexed-via-export1"
+            Depends { name: "multiplex-with-export" }
+        }
+        Product {
+            name: "non-multiplexed-with-dependencies-on-multiplexed-via-export2"
+            Depends { name: "nonmultiplex-with-export" }
+        }
+        Product {
+            name: "non-multiplexed-with-dependencies-on-aggregation-via-export"
+            Depends { name: "nonmultiplex-exporting-aggregation" }
+        }
     }
-    Product {
-        name: "non-multiplexed-with-dependencies-on-aggregation-via-export"
-        Depends { name: "nonmultiplex-exporting-aggregation" }
+
+    Project {
+        name: "subproject 2"
+        Product {
+            name: "no-multiplexing"
+            type: ["reversed-text"]
+            files: ["foo.txt"]
+        }
+        Product {
+            name: "multiplex-without-aggregator-2"
+            type: ["reversed-text"]
+            files: ["foo.txt"]
+            multiplexByQbsProperties: ["architectures"]
+            qbs.architectures: ["TRS-80", "C64"]
+        }
+        Product {
+            name: "multiplex-with-export"
+            type: ["reversed-text"]
+            files: ["foo.txt"]
+            multiplexByQbsProperties: ["architectures"]
+            qbs.architectures: ["TRS-80", "C64"]
+            Export { Depends { name: "multiplex-without-aggregator-2" } }
+        }
+        Product {
+            name: "nonmultiplex-with-export"
+            type: ["reversed-text"]
+            files: ["foo.txt"]
+            Export { Depends { name: "multiplex-without-aggregator-2" } }
+        }
+        Product {
+            name: "nonmultiplex-exporting-aggregation"
+            type: ["reversed-text"]
+            files: ["foo.txt"]
+            Export { Depends { name: "multiplex-with-aggregator-2" } }
+        }
+        Product {
+            name: "multiplex-without-aggregator-4"
+            type: ["reversed-text"]
+            files: ["foo.txt"]
+            multiplexByQbsProperties: ["architectures", "buildVariants"]
+            qbs.architectures: ["TRS-80", "C64"]
+            qbs.buildVariants: ["debug", "release"]
+        }
     }
+
     Product {
         name: "aggregate-with-dependencies-on-aggregation-via-export"
         Depends { name: "nonmultiplex-exporting-aggregation" }