diff options
| author | Raphael Cotty <raphael.cotty@gmail.com> | 2021-04-29 20:09:35 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2021-05-07 09:56:17 +0000 |
| commit | c2b7dd88e2f3ac5ebed99301ec8f847ffaedcb87 (patch) | |
| tree | b46588e97a52a7c02896f5ee60d0c121a57ccf85 /tests/auto | |
| parent | 3972a77103027b8e1a69754f0b21682b653fa2fb (diff) | |
Replace "product" variable by "exportingProduct" in Export items
"product" variable in an Export item will point to the "importingProduct"
in 1.21.
This patch prepares the change by replacing "product" by "importingProduct"
when necessary.
Task-number: QBS-1576
Change-Id: I215d46484754e76771039a750dc4beb33d8a0c9c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto')
5 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs index cc86a4402..2efe8d4e8 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs +++ b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs @@ -64,7 +64,7 @@ Project { Export { Depends { name: "cpp" } - cpp.includePaths: [product.sourceDirectory] + cpp.includePaths: [exportingProduct.sourceDirectory] } } } diff --git a/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs b/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs index 6960c7d17..829aa5f3e 100644 --- a/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs +++ b/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs @@ -25,7 +25,7 @@ Project { Depends { name: "helper2" } Export { Depends { name: "cpp" } - cpp.includePaths: [product.sourceDirectory + '/helper1'] + cpp.includePaths: [exportingProduct.sourceDirectory + '/helper1'] } } @@ -38,7 +38,7 @@ Project { Depends { name: "cpp" } Export { Depends { name: "cpp" } - cpp.includePaths: [product.sourceDirectory + '/helper2'] + cpp.includePaths: [exportingProduct.sourceDirectory + '/helper2'] } } } diff --git a/tests/auto/blackbox/testdata-windows/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata-windows/wix/WiXInstallers.qbs index 07f61ba2c..7e1dbf5e3 100644 --- a/tests/auto/blackbox/testdata-windows/wix/WiXInstallers.qbs +++ b/tests/auto/blackbox/testdata-windows/wix/WiXInstallers.qbs @@ -12,8 +12,8 @@ Project { Export { Depends { name: "wix" } wix.defines: base.concat(["msiName=" + - FileInfo.joinPaths(product.buildDirectory, - product.targetName + wix.windowsInstallerSuffix)]) + FileInfo.joinPaths(exportingProduct.buildDirectory, + exportingProduct.targetName + wix.windowsInstallerSuffix)]) } } diff --git a/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs b/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs index cf1fabf24..2d9afb134 100644 --- a/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs +++ b/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs @@ -40,7 +40,7 @@ Project { Depends { name: "cpp" } Export { Depends { name: "cpp" } - cpp.includePaths: [product.sourceDirectory + '/some helper'] + cpp.includePaths: [exportingProduct.sourceDirectory + '/some helper'] } } } diff --git a/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs b/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs index 0dc6fb2ea..b01a47a39 100644 --- a/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs +++ b/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs @@ -32,7 +32,7 @@ Project { Depends { name: "protobuf.cpp"; required: false } cpp.cxxLanguageVersion: "c++11" cpp.minimumMacosVersion: "10.8" - cpp.includePaths: product.protobuf.cpp.outputDir + cpp.includePaths: exportingProduct.protobuf.cpp.outputDir } } |