diff options
| -rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 7 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index f69f07239..9f6848e0a 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -1090,9 +1090,12 @@ Passes \c{-miphoneos-version-min=<version>} to the compiler. - If left undefined, compiler defaults will be used. + If set to undefined, compiler defaults will be used. - \nodefaultvalue + \note \QBS sets minimum version to \c "6.0" for \c armv7a because earlier iOS versions are + broken in recent XCode installations. + + \defaultvalue \c "6.0" for \c armv7a, \c undefined otherwise */ /*! diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index 35a5de4f0..bcc82d57a 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -104,7 +104,7 @@ Module { to the compiler. if undefined, compiler defaults will be used." } - property string minimumIosVersion + property string minimumIosVersion: qbs.architecture == "armv7a" ? "6.0" : undefined PropertyOptions { name: "minimumIosVersion" description: "a version number in the format [major].[minor] indicating the earliest \ |