diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2024-05-07 18:08:49 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2024-05-08 13:45:28 +0000 |
commit | d18ee709b39865162006d04243d7fbc13d7a3296 (patch) | |
tree | 54e8ec55374b0e696e39d9b4a6426a52345c1839 /share/qbs/modules | |
parent | 28204c66ea1077cf1af69632f0e2fe0b48b8a510 (diff) |
Do not allow id properties in Module items
This file-scope QML construct is generally rather dubious in qbs, but we
make it work in most contexts by injecting the id scope into e.g. the
surrounding module instance. However, for modules itself this is not
possible, and there we should prevent id usage altogether, rather than
letting users run into weird follow-up problems.
Task-number: QBS-1770
Change-Id: Ib3efca21e77758c22313d19afe60cd877be0d98a
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules')
-rw-r--r-- | share/qbs/modules/xcode/xcode.qbs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs index c052da44c..2c0cd001a 100644 --- a/share/qbs/modules/xcode/xcode.qbs +++ b/share/qbs/modules/xcode/xcode.qbs @@ -9,21 +9,19 @@ import qbs.PropertyList import qbs.Utilities Module { - id: xcodeModule - Probes.XcodeLocationProbe { id: xcodeLocationProbe - condition: !xcodeModule.developerPath + condition: !developerPath } Probes.XcodeProbe { id: xcodeProbe - developerPath: xcodeModule.developerPath - platformType: xcodeModule.platformType - platformPath: xcodeModule.platformPath - devicePlatformPath: xcodeModule.devicePlatformPath - xcodebuildPath: xcodeModule.xcodebuildPath - sdksPath: xcodeModule.sdksPath + developerPath: parent.developerPath + platformType: parent.platformType + platformPath: parent.platformPath + devicePlatformPath: parent.devicePlatformPath + xcodebuildPath: parent.xcodebuildPath + sdksPath: parent.sdksPath } condition: qbs.targetOS.includes("darwin") && |