diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-02 12:51:29 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-09 12:28:32 +0200 |
| commit | 63174f2538c61407d61df48840ed9f7062f3ae0f (patch) | |
| tree | ae15f7691eeb17cf75dcc052693c2a7331b8e0bf /tests | |
| parent | abd6dad9f0e0f94a32ada3116e7ebf4da830d23b (diff) | |
| download | qbs-63174f2538c61407d61df48840ed9f7062f3ae0f.tar.gz | |
Introduce new project/product property "qbsSearchPaths".
This extends preferences.qbsPath and allows to use project-specific
imports. It also deprecates the "moduleSearchPaths" property, which
becomes redundant now.
Change-Id: I66ff8aa57f6b2657211e3f4541909b2572c6d613
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
4 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/subprojects/resources/imports/LibraryType/type.js b/tests/auto/blackbox/testdata/subprojects/resources/imports/LibraryType/type.js new file mode 100644 index 000000000..cb07f8e5b --- /dev/null +++ b/tests/auto/blackbox/testdata/subprojects/resources/imports/LibraryType/type.js @@ -0,0 +1 @@ +function type() { return "dynamiclibrary"; } diff --git a/tests/auto/blackbox/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs b/tests/auto/blackbox/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs new file mode 100644 index 000000000..03d649309 --- /dev/null +++ b/tests/auto/blackbox/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs @@ -0,0 +1,5 @@ +import qbs + +Module { + Depends { name: "Qt.core" } +} diff --git a/tests/auto/blackbox/testdata/subprojects/subproject2/subproject3/subproject3.qbs b/tests/auto/blackbox/testdata/subprojects/subproject2/subproject3/subproject3.qbs index afee6996d..acdf1d7e6 100644 --- a/tests/auto/blackbox/testdata/subprojects/subproject2/subproject3/subproject3.qbs +++ b/tests/auto/blackbox/testdata/subprojects/subproject2/subproject3/subproject3.qbs @@ -1,12 +1,14 @@ import qbs +import LibraryType Project { condition: false property string libNameSuffix: "blubb" - DynamicLibrary { + Product { name: project.libNamePrefix + project.libNameSuffix + type: LibraryType.type() Depends { name: "cpp" } - Depends { name: "Qt.core" } + Depends { name: "QtCoreDepender" } cpp.defines: "MY_EXPORT=Q_DECL_EXPORT" files: "testlib.cpp" Export { Depends { name: "Qt.core" } } diff --git a/tests/auto/blackbox/testdata/subprojects/toplevelproject.qbs b/tests/auto/blackbox/testdata/subprojects/toplevelproject.qbs index a32c13d0d..84a2a211f 100644 --- a/tests/auto/blackbox/testdata/subprojects/toplevelproject.qbs +++ b/tests/auto/blackbox/testdata/subprojects/toplevelproject.qbs @@ -14,4 +14,6 @@ Project { files: "subproject1/main.cpp" } } + + qbsSearchPaths: ["resources"] } |