diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-07-10 09:52:38 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-07-15 11:17:18 +0000 |
| commit | f13ba2d0e3c8015649e874c8f643f6a19debf448 (patch) | |
| tree | 451ffbf21d3e4ce8eaa88d0d22d3839c3969b928 | |
| parent | b11257cf80eecaa7579b171ef0c53928b3c36b82 (diff) | |
Set minimumTvosVersion to "6.0" by default
This fixes (at least) two compile errors:
- clang: error: invalid deployment target for -stdlib=libc++ (requires
iOS 5.0 or later)
- ld: library not found for -ldylib1.o
The dylib1 is only present on macOS and not present in recent tvOS/iOS
SDKs, clang tries to link to it if deployment target is less or equal to
"5.0".
Change-Id: Ie77a514bb2661312823df054f0dfca07d69e3059
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 5 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index 9f6848e0a..9f554dc1c 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -1149,7 +1149,10 @@ If left undefined, compiler defaults will be used. - \nodefaultvalue + \note \QBS sets the minimum version to \c "6.0", because earlier tvOS + versions are not supported by recent XCode installations by default. + + \defaultvalue \c "6.0 */ /*! diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index bcc82d57a..200d91d09 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -120,7 +120,7 @@ Module { defaults will be used." } - property string minimumTvosVersion + property string minimumTvosVersion: "6.0" PropertyOptions { name: "minimumTvosVersion" description: "a version number in the format [major].[minor] indicating the earliest \ |