aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata/dynamic-library-in-module
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-04-16 14:34:46 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-04-19 13:44:24 +0000
commit99bb3be64acae4f9d1bf2af150a503564a79f20b (patch)
treef45af55042d6cfaaae7f7bde461b03ecc956f4f7 /tests/auto/blackbox/testdata/dynamic-library-in-module
parentf092eb3d17dc06e9196c95570a52dc5509b55484 (diff)
Prevent empty arrays from ending up in the JS artifacts map
We want to guarantee that p.artifacts["xyz"] is undefined if product or module "p" does not have an artifact tagged "xyz". Otherwise, the code on the JS side becomes needlessly complicated. Change-Id: I6bffa2289ce8a021eb856697545a8149f88e616d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/dynamic-library-in-module')
-rw-r--r--tests/auto/blackbox/testdata/dynamic-library-in-module/lib5.cpp1
-rw-r--r--tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs7
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/lib5.cpp b/tests/auto/blackbox/testdata/dynamic-library-in-module/lib5.cpp
new file mode 100644
index 000000000..49887a957
--- /dev/null
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/lib5.cpp
@@ -0,0 +1 @@
+void staticLibFunc() { }
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
index cfad43973..6bd0de9ab 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
@@ -7,6 +7,7 @@ Project {
Depends { name: "theotherlib" }
Depends { name: "thethirdlib" }
Depends { name: "thefourthlib" }
+ Depends { name: "staticlib" }
files: "main.cpp"
Group {
fileTagsFilter: "dynamiclibrary"
@@ -23,4 +24,10 @@ Project {
cpp.rpaths: [qbs.installRoot]
}
}
+ StaticLibrary {
+ name: "staticlib"
+ Depends { name: "cpp" }
+ Depends { name: "theotherlib" }
+ files: "lib5.cpp"
+ }
}