Add support for soft dependencies.

Depends items get a "required" property, module presence can be
checked via "present" property.

Change-Id: Id188a442b3b32c5b2e50e568e59cee074774f125
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

4 files changed, 25 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/soft-dependency/main.cpp b/tests/auto/blackbox/testdata/soft-dependency/main.cpp
new file mode 100644
index 000000000..5f3248c7f
--- /dev/null
+++ b/tests/auto/blackbox/testdata/soft-dependency/main.cpp
@@ -0,0 +1,4 @@
+int main()
+{
+    thisShouldNotLink();
+}
diff --git a/tests/auto/blackbox/testdata/soft-dependency/project.qbs b/tests/auto/blackbox/testdata/soft-dependency/project.qbs
new file mode 100644
index 000000000..bbf37fda8
--- /dev/null
+++ b/tests/auto/blackbox/testdata/soft-dependency/project.qbs
@@ -0,0 +1,14 @@
+import qbs
+
+Application {
+    Depends {
+        name: "nosuchmodule"
+        required: false
+    }
+    Depends {
+        name: "cpp"
+        condition: nosuchmodule.present
+    }
+
+    files: "main.cpp"
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index f6b62d4fd..ab6cec81c 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -549,6 +549,12 @@ void TestBlackbox::renameTargetArtifact()
     QCOMPARE(m_qbsStdout.count("linking"), 2);
 }
 
+void TestBlackbox::softDependency()
+{
+    QDir::setCurrent(testDataDir + "/soft-dependency");
+    QCOMPARE(runQbs(), 0);
+}
+
 void TestBlackbox::subProjects()
 {
     QDir::setCurrent(testDataDir + "/subprojects");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 64ccf84b9..b9f0b6ddc 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -128,6 +128,7 @@ private slots:
     void rc();
     void renameProduct();
     void renameTargetArtifact();
+    void softDependency();
     void subProjects();
     void track_qrc();
     void track_qobject_change();