aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2023-12-01 15:28:32 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2023-12-05 09:11:25 +0000
commitefb1f863dbafa0d04e185bc10d3156b15bb23b3d (patch)
treefe5d7cb9477982678b32cac644863500c942dcbe /share
parente7ee3b6ec72bcadd23809db63281cf5b3a4f67fc (diff)
Loader: Make module properties accessible for groups in modules
It's not only cumbersome having to write out the name of the surrounding module, but it actually prevents some legitimate use cases, e.g. when using a Module base item where the name of the derived module is not statically known. Task-number: QBS-1770 Change-Id: Iad4f6a16a27c51b303f26bc98fd9b2a4174d5f42 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/module-providers/Qt/setup-qt.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js
index 99c4f1d58..9a314822b 100644
--- a/share/qbs/module-providers/Qt/setup-qt.js
+++ b/share/qbs/module-providers/Qt/setup-qt.js
@@ -318,10 +318,9 @@ function replaceSpecialValues(content, module, qtProps, abi) {
additionalContent += "Group {\n";
if (module.isPlugin) {
additionalContent += indent + indent
- + "condition: Qt[\"" + module.qbsName + "\"].enableLinking\n";
+ + "condition: enableLinking\n";
}
- additionalContent += indent + indent + "files: [Qt[\"" + module.qbsName + "\"]"
- + ".libFilePath]\n"
+ additionalContent += indent + indent + "files: libFilePath\n"
+ indent + indent + "filesAreTargets: true\n"
+ indent + indent + "fileTags: [\"" + libraryFileTag(module, qtProps)
+ "\"]\n"