diff options
author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-18 16:03:19 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-18 17:26:07 +0200 |
commit | 919d216a3774ca23a0b7ebe05ba68864c46aad87 (patch) | |
tree | 41a89ab3d4a2f598b1397ac389ab0e3dfbe1bc6c /tests/manual | |
parent | 63a4eab86569cd82484d63472377382912d42689 (diff) |
ProductModule dependency propagation fixed
Before a ProductModule inherited all modules the product uses.
That's why wrong includePaths etc. were propagated through
the chain of ProductModules.
Now one needs to explicitely add a Depends item for every
module that's used in a ProductModule. This is much more
consistent with the semantics of modules in products.
Example:
ProductModule {
cpp.defines: ["FOO"]
}
is no longer valid. It must be changed to
ProductModule {
Depends { name: "cpp" }
cpp.defines: ["FOO"]
}
Change-Id: I9b1a42e6bcf56c4fb17e1a19d558fa82d629ff78
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/link_staticlib/link_staticlib.qbp | 1 | ||||
-rw-r--r-- | tests/manual/proper quoting/proper quoting.qbp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/manual/link_staticlib/link_staticlib.qbp b/tests/manual/link_staticlib/link_staticlib.qbp index a86b50f8d..645d06bc0 100644 --- a/tests/manual/link_staticlib/link_staticlib.qbp +++ b/tests/manual/link_staticlib/link_staticlib.qbp @@ -23,6 +23,7 @@ Project { ] Depends { name: "cpp" } ProductModule { + Depends { name: "cpp" } cpp.includePaths: ['helper'] } } diff --git a/tests/manual/proper quoting/proper quoting.qbp b/tests/manual/proper quoting/proper quoting.qbp index f56f78071..b721568c7 100644 --- a/tests/manual/proper quoting/proper quoting.qbp +++ b/tests/manual/proper quoting/proper quoting.qbp @@ -35,6 +35,7 @@ Project { ] Depends { name: "cpp" } ProductModule { + Depends { name: "cpp" } cpp.includePaths: ['some helper'] } // cpp.responseFileThreshold: 0 |