aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-08-21 13:46:50 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2020-08-24 11:19:15 +0000
commit7f424ec15884e23ef56c7781f0a8de02ed016ae1 (patch)
tree096c118e13a5fa9b9cdbf6fa7bab8369be8354e0 /share/qbs/modules
parent450ccbdf8b9981d91980fd8917f428949129559d (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 'share/qbs/modules')
-rw-r--r--share/qbs/modules/Exporter/qbs/qbsexporter.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/Exporter/qbs/qbsexporter.js b/share/qbs/modules/Exporter/qbs/qbsexporter.js
index 16408174b..015ed4418 100644
--- a/share/qbs/modules/Exporter/qbs/qbsexporter.js
+++ b/share/qbs/modules/Exporter/qbs/qbsexporter.js
@@ -179,7 +179,7 @@ function writeProperty(project, product, moduleInstallDir, prop, indentation, co
// We emit the literal value, unless the source code clearly refers to values from inside the
// original project, in which case the evaluated value is used.
- if (considerValue && /(project|product)\./.test(prop.sourceCode)) {
+ if (considerValue && /(project|product|exportingProduct)\./.test(prop.sourceCode)) {
var value;
if (isModuleProperty) {
var propertyName = prop.name.slice(separatorIndex + 1);