ModuleLoader: Do dependency resolving in two stages

... if needed. This is required to lift the restriction that products
cannot be matched by Depends.productTypes if their type depends on
a module property, which turned out to be too limiting in practice.

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

2 files changed, 13 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs
new file mode 100644
index 000000000..f3d789842
--- /dev/null
+++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs
@@ -0,0 +1,5 @@
+import qbs
+
+Module {
+    property bool typeDecider: true
+}
diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
index 73c9c695d..b5af509a0 100644
--- a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
+++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
@@ -24,6 +24,14 @@ Project {
             name: "app3"
             files: "main.cpp"
         }
+        Product {
+            type: myconfig.typeDecider ? ["application"] : []
+            Depends { name: "cpp" }
+            Depends { name: "myconfig" }
+            consoleApplication: true
+            name: "app4"
+            files: "main.cpp"
+        }
         CppApplication {
             condition: false
             consoleApplication: true