aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-07-09 15:17:14 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-07-09 16:23:16 +0200
commit1f15a83966d600d4f93c07c17a07b24a1c1627b2 (patch)
treeb60ecfdba024cc32645fe393a1338e33528e9913 /tests
parent04e31ed5cd574fd75372712d6b669c3d2fd50a20 (diff)
Allow empty submodules property in Depends item.
It just means that no dependency should be pulled in by this item. Useful for this kind of thing: Product { Depends { name: "Qt" submodules: theQtSubModulesINeed } property stringList theQtSubModulesIneed // Can be empty. } Change-Id: I8e500c3acfa4374be9005fcf349c0417ad47a76e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/blackbox/testdata/empty-submodules-list/project.qbs8
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp6
-rw-r--r--tests/auto/blackbox/tst_blackbox.h1
3 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/empty-submodules-list/project.qbs b/tests/auto/blackbox/testdata/empty-submodules-list/project.qbs
new file mode 100644
index 000000000..88b5e3177
--- /dev/null
+++ b/tests/auto/blackbox/testdata/empty-submodules-list/project.qbs
@@ -0,0 +1,8 @@
+import qbs
+
+CppApplication {
+ Depends {
+ name: "dummy"
+ submodules: []
+ }
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index d7d6129d1..feba580d9 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1569,6 +1569,12 @@ void TestBlackbox::emptyFileTagList()
QCOMPARE(runQbs(), 0);
}
+void TestBlackbox::emptySubmodulesList()
+{
+ QDir::setCurrent(testDataDir + "/empty-submodules-list");
+ QCOMPARE(runQbs(), 0);
+}
+
void TestBlackbox::erroneousFiles_data()
{
QTest::addColumn<QString>("errorMessage");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 6076e4fda..658653bc9 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -116,6 +116,7 @@ private slots:
void dynamicLibs();
void dynamicRuleOutputs();
void emptyFileTagList();
+ void emptySubmodulesList();
void erroneousFiles_data();
void erroneousFiles();
void explicitlyDependsOn();