diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-14 10:26:58 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-15 07:37:15 +0000 |
| commit | 979b2524818fa0b618ac8308c608c6a593e5f521 (patch) | |
| tree | dc794a877864ca39df6a1a76e502ec8fc1fc4876 /tests/auto/blackbox/testdata/choose-module-instance | |
| parent | 20d261df437c9c08462735909e9c62c2b7615a55 (diff) | |
Allow module instances with the same priority in different search paths
The search path order provides additional prioritization. Conflicts can
now only occur between candidates in the same directory. This is needed
e.g. to allow distributions to provide global search paths.
Change-Id: I698a96e8943041fb0c4536901f75394bacd7fb40
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/choose-module-instance')
| -rw-r--r-- | tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs | 5 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/choose-module-instance/other-searchpath/modules/limerick/generic.qbs | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs b/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs index fb1f04d83..233e21746 100644 --- a/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs +++ b/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs @@ -2,7 +2,10 @@ import qbs import qbs.FileInfo Project { - qbsSearchPaths: [".", path, "modules/..", FileInfo.path(FileInfo.joinPaths(path, "modules"))] + qbsSearchPaths: [ + ".", path, "modules/..", FileInfo.path(FileInfo.joinPaths(path, "modules")), + "other-searchpath" + ] Product { Depends { name: "limerick" } type: ["text"] diff --git a/tests/auto/blackbox/testdata/choose-module-instance/other-searchpath/modules/limerick/generic.qbs b/tests/auto/blackbox/testdata/choose-module-instance/other-searchpath/modules/limerick/generic.qbs new file mode 100644 index 000000000..2ebaaac11 --- /dev/null +++ b/tests/auto/blackbox/testdata/choose-module-instance/other-searchpath/modules/limerick/generic.qbs @@ -0,0 +1,3 @@ +Module { + condition: !qbs.targetOS.contains("Beatles") +} |