diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-08-21 13:46:50 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-08-24 11:19:15 +0000 |
| commit | 7f424ec15884e23ef56c7781f0a8de02ed016ae1 (patch) | |
| tree | 096c118e13a5fa9b9cdbf6fa7bab8369be8354e0 /tests/auto/blackbox/testdata-java | |
| parent | 450ccbdf8b9981d91980fd8917f428949129559d (diff) | |
Introduce an "exportingProduct" variable
... for use in Export items.
It's not obvious that "product" refers to the exporting product, and in
fact setting it up this way pollutes the scope for modules loaded via
Export items.
Therefore, we introduce exportingProduct for symmetry with
importingProduct.
[ChangeLog] Deprecate the product variable inside Export items in favor
of the new exportingProduct variable.
Task-number: QBS-1576
Change-Id: Ie91752d1ae2160cb7701ae0167bccde0cd5c0e5d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'tests/auto/blackbox/testdata-java')
| -rw-r--r-- | tests/auto/blackbox/testdata-java/java/vehicles.qbs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/blackbox/testdata-java/java/vehicles.qbs b/tests/auto/blackbox/testdata-java/java/vehicles.qbs index 8153efe00..fa632b7b3 100644 --- a/tests/auto/blackbox/testdata-java/java/vehicles.qbs +++ b/tests/auto/blackbox/testdata-java/java/vehicles.qbs @@ -34,7 +34,7 @@ Project { Export { Depends { name: "java" } - java.manifestClassPath: [product.targetName + ".jar"] + java.manifestClassPath: [exportingProduct.targetName + ".jar"] } } @@ -50,7 +50,7 @@ Project { Export { Depends { name: "java" } - java.manifestClassPath: [product.targetName + ".jar"] + java.manifestClassPath: [exportingProduct.targetName + ".jar"] } } @@ -68,13 +68,13 @@ Project { cpp.systemIncludePaths: { var paths = importingProduct.java.jdkIncludePaths; if (Utilities.versionCompare(importingProduct.java.version, "1.8") >= 0) { - paths.push(product.buildDirectory); // generated JNI headers + paths.push(exportingProduct.buildDirectory); // generated JNI headers } return paths; } Depends { name: "java" } - java.manifestClassPath: [product.targetName + ".jar"] + java.manifestClassPath: [exportingProduct.targetName + ".jar"] } qbs.installPrefix: "" |