diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-17 15:09:26 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-27 16:57:35 +0000 |
| commit | 33e9cd462a6c7b6dc552669361f4321ffdb22ff3 (patch) | |
| tree | 2b81a986c4e6c7f3094a8e5ed959bf2a8fcd057a /share/qbs/modules/cpp/CppModule.qbs | |
| parent | 0b0832aaf4cc26bee202207c8cbe64650ee2d2fd (diff) | |
Do the OS X to macOS rename.v1.5.2
[ChangeLog] The "osx" value in qbs.hostOS and qbs.targetOS has been
replaced with "macos". For backwards compatibility, qbs.hostOS will
still contain "osx" in addition to "macos", and an error will be printed
if qbs.targetOS contains "osx" but not "macos". Specifying "macos"
without "osx" is allowed. These checks are subject to be removed in a
future version of qbs, so update your hostOS and targetOS checks
accordingly.
[ChangeLog] cpp.minimumOsxVersion has been deprecated and replaced with
cpp.minimumMacosVersion. cpp.minimumOsxVersion is subject to be removed
in a future version of qbs, so update your projects accordingly.
Change-Id: I479891829dff6eb6750cb2a04e1395f085896f63
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'share/qbs/modules/cpp/CppModule.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index 7dabab95e..be2057ef0 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -83,10 +83,12 @@ Module { } property string minimumOsxVersion + + property string minimumMacosVersion: minimumOsxVersion PropertyOptions { - name: "minimumOsxVersion" + name: "minimumMacosVersion" description: "a version number in the format [major].[minor] indicating the earliest \ - version of OS X that the product should run on. passes -mmacosx-version-min=<version> \ + version of macOS that the product should run on. passes -mmacosx-version-min=<version> \ to the compiler. if undefined, compiler defaults will be used." } @@ -135,7 +137,7 @@ Module { PropertyOptions { name: "installNamePrefix" description: "The prefix for the internal install name (LC_ID_DYLIB) of a dynamic library \ - on Darwin (OS X and iOS)." + on Darwin (macOS and iOS)." } property pathList includePaths @@ -297,7 +299,7 @@ Module { property stringList platformObjcxxFlags property stringList platformLinkerFlags - // OS X and iOS properties + // Apple platforms properties property bool automaticReferenceCounting PropertyOptions { name: "automaticReferenceCounting" |