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 /src/lib/scriptengine | |
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 'src/lib/scriptengine')
-rw-r--r-- | src/lib/scriptengine/scriptengine.qbs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs index 3225ceaac..c7061fa98 100644 --- a/src/lib/scriptengine/scriptengine.qbs +++ b/src/lib/scriptengine/scriptengine.qbs @@ -368,7 +368,7 @@ Project { Export { Depends { name: "QtScriptFwdHeaders" } Depends { name: "cpp" } - property stringList includePaths: [product.sourceDirectory + "/include"] + property stringList includePaths: [exportingProduct.sourceDirectory + "/include"] .concat(QtScriptFwdHeaders.publicIncludePaths) Properties { condition: qbs.targetOS.contains("unix") @@ -441,10 +441,10 @@ Project { Export { Depends { name: "Qt.core" } property stringList publicIncludePaths: [ - FileInfo.joinPaths(product.buildDirectory, "include") + FileInfo.joinPaths(exportingProduct.buildDirectory, "include") ] property stringList privateIncludePaths: [ - FileInfo.joinPaths(product.buildDirectory, "include", + FileInfo.joinPaths(exportingProduct.buildDirectory, "include", "QtScript", Qt.core.version, "QtScript") ] } |