diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-07-15 14:21:21 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-07-16 09:50:11 +0000 |
| commit | 6fcad2b80886c4766bd03618f01df543be5d3498 (patch) | |
| tree | 14b2c345e5ffa0329de763e36cdad655006a2f66 /share/qbs/modules/cpp/ios-gcc.qbs | |
| parent | af4655448b16eba905be8e242081b76068993ef2 (diff) | |
| download | qbs-6fcad2b80886c4766bd03618f01df543be5d3498.tar.gz | |
Don't except on evaluating condition for cpp modules.
qbs.toolchain is not a required property, and this fixes the very
unintuitive 'TypeError: Result of expression 'qbs.toolchain' [undefined]
is not an object.' when using, say, an Android profile with wrong
dependencies.
Change-Id: Ife819c9d292f34799c03c29454a76a153934d797
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'share/qbs/modules/cpp/ios-gcc.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/ios-gcc.qbs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs index e890abf05..d087bb6d2 100644 --- a/share/qbs/modules/cpp/ios-gcc.qbs +++ b/share/qbs/modules/cpp/ios-gcc.qbs @@ -34,7 +34,9 @@ import qbs.File import qbs.ModUtils DarwinGCC { - condition: qbs.hostOS.contains('osx') && qbs.targetOS.contains('ios') && qbs.toolchain.contains('gcc') + condition: qbs.hostOS.contains('osx') && + qbs.targetOS.contains('ios') && + qbs.toolchain && qbs.toolchain.contains('gcc') // Setting a minimum is especially important for Simulator or CC/LD thinks the target is OS X minimumIosVersion: xcodeSdkVersion || (cxxStandardLibrary === "libc++" ? "5.0" : undefined) |