diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-24 15:30:56 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-24 15:30:56 +0200 |
| commit | c50827bf53e3863adcfd8c0e38aa5b7773eb075f (patch) | |
| tree | 3df66a6a76cace400d55bd2610f6aa2ce1fdc5db /share/qbs/modules/cpp/ios-gcc.qbs | |
| parent | 5b3c816ca35cd4dfd14767ac06238fd3ace29b61 (diff) | |
| parent | b24c37c89f7db5363f4860ba269dba482b19a5f1 (diff) | |
Merge branch 1.4 into master.
Change-Id: I79f2638a024a807151a12d1f0b701d6533a3311f
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) |