diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-06-16 15:18:46 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-06-16 14:00:18 +0000 |
| commit | e16dd899d5d8329aaa83b77393e50e5feba247ca (patch) | |
| tree | 0ce80921410e814fa375814b4c3ca4ff3c2b388d /tests | |
| parent | 397172f1a8c3c5dce4809d46675dee5ae58cc841 (diff) | |
Clean up TestApi::buildProject(static library dependencies)
The Export item in the project file adds the external lib dependencies
to the dependents of static lib "d". It was needed before we correctly
handled library dependencies (c14a8982).
Change-Id: Ic63a2c6afdd9568581f87da81747cdc287bba9cb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs index ccbe49a0b..abb9dbf9d 100644 --- a/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs +++ b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs @@ -48,30 +48,17 @@ Project { Properties { condition: qbs.targetOS.contains("windows") cpp.defines: ["WITH_SETUPAPI"] + cpp.staticLibraries: ["setupapi"] } Properties { condition: qbs.targetOS.contains("macos") cpp.defines: ["WITH_LEX_YACC"] + cpp.staticLibraries: ["l", "y"] } Properties { condition: qbs.targetOS.contains("linux") cpp.defines: ["WITH_PTHREAD"] - } - - Export { - Depends { name: "cpp" } - Properties { - condition: qbs.targetOS.contains("linux") - cpp.staticLibraries: ["pthread"] - } - Properties { - condition: qbs.targetOS.contains("macos") - cpp.staticLibraries: ["l", "y"] - } - Properties { - condition: qbs.targetOS.contains("windows") - cpp.staticLibraries: ["setupapi"] - } + cpp.staticLibraries: ["pthread"] } } StaticLibrary { |